Convert files with only CRLF line endings to pure LF WebIDL/tests/submissions/W3C/valid/idl/documentation-dos.widl was left as CRLF because the name makes it look intentional. 3 files with mixed line endings remain: cors/resources/cors-headers.asis html/semantics/embedded-content-0/the-canvas-element/size.attributes.parse.whitespace.html old-tests/submission/Opera/media/track/webvtt/parsing/support/newlines.vtt To verify that this commit makes no other changes: $ git diff --name-only HEAD^ | xargs unix2dos $ git diff HEAD^ # should show nothing
diff --git a/websockets/Close-0.htm b/websockets/Close-0.htm index 796cb4d..e6496d9 100644 --- a/websockets/Close-0.htm +++ b/websockets/Close-0.htm
@@ -1,25 +1,25 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Close WebSocket - Code is 0</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var test = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - close(0) - INVALID_ACCESS_ERR is thrown"); - - var wsocket = CreateWebSocket(false, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', test.step_func(function (evt) { - assert_throws("INVALID_ACCESS_ERR", function () { wsocket.close(0, "Close not in range 3000-4999") }); - test.done(); - }), true); - </script> - -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Close WebSocket - Code is 0</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var test = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - close(0) - INVALID_ACCESS_ERR is thrown"); + + var wsocket = CreateWebSocket(false, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', test.step_func(function (evt) { + assert_throws("INVALID_ACCESS_ERR", function () { wsocket.close(0, "Close not in range 3000-4999") }); + test.done(); + }), true); + </script> + +</body> +</html> diff --git a/websockets/Close-1000-reason.htm b/websockets/Close-1000-reason.htm index aa53045..88fbc61 100644 --- a/websockets/Close-1000-reason.htm +++ b/websockets/Close-1000-reason.htm
@@ -1,35 +1,35 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Close WebSocket - Code is 1000 and reason</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - Connection should be opened"); - var testClose = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - close(1000, reason) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed"); - - var wsocket = CreateWebSocket(false, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.close(1000, "Clean Close"); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be opened"); - assert_equals(wsocket.readyState, 3, "readyState should be 3(CLOSED)"); - assert_equals(evt.wasClean, true, "wasClean should be TRUE"); - testClose.done(); - }), true); - - </script> - -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Close WebSocket - Code is 1000 and reason</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - Connection should be opened"); + var testClose = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - close(1000, reason) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed"); + + var wsocket = CreateWebSocket(false, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.close(1000, "Clean Close"); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be opened"); + assert_equals(wsocket.readyState, 3, "readyState should be 3(CLOSED)"); + assert_equals(evt.wasClean, true, "wasClean should be TRUE"); + testClose.done(); + }), true); + + </script> + +</body> +</html> diff --git a/websockets/Close-1000.htm b/websockets/Close-1000.htm index 7b19723..d1711d9 100644 --- a/websockets/Close-1000.htm +++ b/websockets/Close-1000.htm
@@ -1,35 +1,35 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Close WebSocket - Code is 1000</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Create WebSocket - Connection should be opened"); - var testClose = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - close(1000) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed"); - - var wsocket = CreateWebSocket(false, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.close(1000); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be opened"); - assert_equals(wsocket.readyState, 3, "readyState should be 3(CLOSED)"); - assert_equals(evt.wasClean, true, "wasClean should be TRUE"); - testClose.done(); - }), true); - - </script> - -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Close WebSocket - Code is 1000</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Create WebSocket - Connection should be opened"); + var testClose = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - close(1000) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed"); + + var wsocket = CreateWebSocket(false, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.close(1000); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be opened"); + assert_equals(wsocket.readyState, 3, "readyState should be 3(CLOSED)"); + assert_equals(evt.wasClean, true, "wasClean should be TRUE"); + testClose.done(); + }), true); + + </script> + +</body> +</html> diff --git a/websockets/Close-null.htm b/websockets/Close-null.htm index 63aadcd..165fc2d 100644 --- a/websockets/Close-null.htm +++ b/websockets/Close-null.htm
@@ -1,25 +1,25 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Close WebSocket - Code is null</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var test = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - close(null) - INVALID_ACCESS_ERR is thrown"); - - var wsocket = CreateWebSocket(false, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', test.step_func(function (evt) { - assert_throws("INVALID_ACCESS_ERR", function () { wsocket.close(null) }); - test.done(); - }), true); - </script> - -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Close WebSocket - Code is null</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var test = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - close(null) - INVALID_ACCESS_ERR is thrown"); + + var wsocket = CreateWebSocket(false, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', test.step_func(function (evt) { + assert_throws("INVALID_ACCESS_ERR", function () { wsocket.close(null) }); + test.done(); + }), true); + </script> + +</body> +</html> diff --git a/websockets/Close-reason-unpaired-surrogates.htm b/websockets/Close-reason-unpaired-surrogates.htm index 5bf2847..faf824c 100644 --- a/websockets/Close-reason-unpaired-surrogates.htm +++ b/websockets/Close-reason-unpaired-surrogates.htm
@@ -1,34 +1,34 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Close WebSocket - Reason with unpaired surrogates</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get opened"); - var testClose = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get closed"); - - var wsocket = CreateWebSocket(false, false, false); - var isOpenCalled = false; - var reason = "\uD807"; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.close(1000, reason); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be opened"); - testClose.done(); - }), true); - - </script> - -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Close WebSocket - Reason with unpaired surrogates</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get opened"); + var testClose = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get closed"); + + var wsocket = CreateWebSocket(false, false, false); + var isOpenCalled = false; + var reason = "\uD807"; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.close(1000, reason); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be opened"); + testClose.done(); + }), true); + + </script> + +</body> +</html> diff --git a/websockets/Close-undefined.htm b/websockets/Close-undefined.htm index dbd8ee6..4f67c06 100644 --- a/websockets/Close-undefined.htm +++ b/websockets/Close-undefined.htm
@@ -1,25 +1,25 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Close WebSocket - Code is undefined</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var test = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - close(undefined) - INVALID_ACCESS_ERR is thrown"); - - var wsocket = CreateWebSocket(false, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', test.step_func(function (evt) { - assert_throws("INVALID_ACCESS_ERR", function () { wsocket.close(undefined) }); - test.done(); - }), true); - </script> - -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Close WebSocket - Code is undefined</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var test = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - close(undefined) - INVALID_ACCESS_ERR is thrown"); + + var wsocket = CreateWebSocket(false, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', test.step_func(function (evt) { + assert_throws("INVALID_ACCESS_ERR", function () { wsocket.close(undefined) }); + test.done(); + }), true); + </script> + +</body> +</html> diff --git a/websockets/Create-Secure-blocked-port.htm b/websockets/Create-Secure-blocked-port.htm index 058bd48..3630826 100644 --- a/websockets/Create-Secure-blocked-port.htm +++ b/websockets/Create-Secure-blocked-port.htm
@@ -1,19 +1,19 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Create Secure WebSocket - blocked port</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script> - test(function () { - var wsocket; - var blockedPort = 25; - assert_throws("SECURITY_ERR", function () { wsocket = CreateWebSocketWithBlockedPort(blockedPort) }); - }, "W3C WebSocket API - Create Secure WebSocket - Pass a URL with a blocked port - SECURITY_ERR should be thrown") - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Create Secure WebSocket - blocked port</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script> + test(function () { + var wsocket; + var blockedPort = 25; + assert_throws("SECURITY_ERR", function () { wsocket = CreateWebSocketWithBlockedPort(blockedPort) }); + }, "W3C WebSocket API - Create Secure WebSocket - Pass a URL with a blocked port - SECURITY_ERR should be thrown") + </script> +</body> +</html> diff --git a/websockets/Create-Secure-extensions-empty.htm b/websockets/Create-Secure-extensions-empty.htm index d02fceb..ea1774d 100644 --- a/websockets/Create-Secure-extensions-empty.htm +++ b/websockets/Create-Secure-extensions-empty.htm
@@ -1,33 +1,33 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Create Secure WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - wsocket.extensions should be set to '' after connection is established - Connection should be opened"); - var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - wsocket.extensions should be set to '' after connection is established - Connection should be closed"); - - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - assert_equals(wsocket.extensions, "", "extensions should be empty"); - wsocket.close(); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be closed"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Create Secure WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - wsocket.extensions should be set to '' after connection is established - Connection should be opened"); + var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - wsocket.extensions should be set to '' after connection is established - Connection should be closed"); + + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + assert_equals(wsocket.extensions, "", "extensions should be empty"); + wsocket.close(); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be closed"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/Create-Secure-url-with-space.htm b/websockets/Create-Secure-url-with-space.htm index 338cd9c..4e12aae 100644 --- a/websockets/Create-Secure-url-with-space.htm +++ b/websockets/Create-Secure-url-with-space.htm
@@ -1,19 +1,19 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Create Secure WebSocket - url with space</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - test(function () { - var wsocket; - var spaceUrl = "html5labs interop.cloudapp.net"; - assert_throws("SYNTAX_ERR", function () { wsocket = CreateWebSocketWithSpaceInUrl(spaceUrl) }); - }, "W3C WebSocket API - Create Secure WebSocket - Pass a URL with a space - SYNTAX_ERR should be thrown") - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Create Secure WebSocket - url with space</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + test(function () { + var wsocket; + var spaceUrl = "html5labs interop.cloudapp.net"; + assert_throws("SYNTAX_ERR", function () { wsocket = CreateWebSocketWithSpaceInUrl(spaceUrl) }); + }, "W3C WebSocket API - Create Secure WebSocket - Pass a URL with a space - SYNTAX_ERR should be thrown") + </script> +</body> +</html> diff --git a/websockets/Create-Secure-valid-url-array-protocols.htm b/websockets/Create-Secure-valid-url-array-protocols.htm index 166e6f9..427f944 100644 --- a/websockets/Create-Secure-valid-url-array-protocols.htm +++ b/websockets/Create-Secure-valid-url-array-protocols.htm
@@ -1,34 +1,34 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Create Secure WebSocket with valid url and array of protocols</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and array of protocol strings - Connection should be opened"); - var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and array of protocol strings - Connection should be closed"); - - var wsocket = CreateWebSocket(true, false, true); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - assert_equals(wsocket.readyState, 1, "readyState should be 1(OPEN)"); - wsocket.close(); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Create Secure WebSocket with valid url and array of protocols</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and array of protocol strings - Connection should be opened"); + var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and array of protocol strings - Connection should be closed"); + + var wsocket = CreateWebSocket(true, false, true); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + assert_equals(wsocket.readyState, 1, "readyState should be 1(OPEN)"); + wsocket.close(); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + + </script> +</body> +</html> diff --git a/websockets/Create-Secure-valid-url-binaryType-blob.htm b/websockets/Create-Secure-valid-url-binaryType-blob.htm index f1bd158..5b45866 100644 --- a/websockets/Create-Secure-valid-url-binaryType-blob.htm +++ b/websockets/Create-Secure-valid-url-binaryType-blob.htm
@@ -1,34 +1,34 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Create Secure WebSocket - binaryType set correctly</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - wsocket.binaryType should be set to 'blob' after connection is established - Connection should be opened"); - var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - wsocket.binaryType should be set to 'blob' after connection is established - Connection should be closed"); - - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - assert_equals(wsocket.binaryType, "blob", "binaryType should be set to Blob"); - wsocket.close(); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Create Secure WebSocket - binaryType set correctly</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - wsocket.binaryType should be set to 'blob' after connection is established - Connection should be opened"); + var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - wsocket.binaryType should be set to 'blob' after connection is established - Connection should be closed"); + + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + assert_equals(wsocket.binaryType, "blob", "binaryType should be set to Blob"); + wsocket.close(); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + + </script> +</body> +</html> diff --git a/websockets/Create-Secure-valid-url-protocol-setCorrectly.htm b/websockets/Create-Secure-valid-url-protocol-setCorrectly.htm index 28f5bf9..4c5d271 100644 --- a/websockets/Create-Secure-valid-url-protocol-setCorrectly.htm +++ b/websockets/Create-Secure-valid-url-protocol-setCorrectly.htm
@@ -1,33 +1,33 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Create Secure WebSocket and verify if protocol is set correctly after connection</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and protocol string - protocol should be set correctly - Connection should be opened"); - var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and protocol string - Connection should be closed"); - - var wsocket = CreateWebSocket(true, true, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - assert_equals(wsocket.protocol, __PROTOCOL, "protocol should be set to echo"); - wsocket.close(); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Create Secure WebSocket and verify if protocol is set correctly after connection</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and protocol string - protocol should be set correctly - Connection should be opened"); + var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and protocol string - Connection should be closed"); + + var wsocket = CreateWebSocket(true, true, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + assert_equals(wsocket.protocol, __PROTOCOL, "protocol should be set to echo"); + wsocket.close(); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/Create-Secure-valid-url-protocol-string.htm b/websockets/Create-Secure-valid-url-protocol-string.htm index b24ea0d..6fcaaec 100644 --- a/websockets/Create-Secure-valid-url-protocol-string.htm +++ b/websockets/Create-Secure-valid-url-protocol-string.htm
@@ -1,34 +1,34 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Create Secure WebSocket with valid url and protocol string</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Check readyState is 1"); - var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and protocol string - Connection should be closed"); - - var wsocket = CreateWebSocket(true, true, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - assert_equals(wsocket.readyState, 1, "readyState should be 1(OPEN)"); - wsocket.close(); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Create Secure WebSocket with valid url and protocol string</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Check readyState is 1"); + var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and protocol string - Connection should be closed"); + + var wsocket = CreateWebSocket(true, true, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + assert_equals(wsocket.readyState, 1, "readyState should be 1(OPEN)"); + wsocket.close(); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + + </script> +</body> +</html> diff --git a/websockets/Create-Secure-valid-url.htm b/websockets/Create-Secure-valid-url.htm index c8ac79b..2e448f2 100644 --- a/websockets/Create-Secure-valid-url.htm +++ b/websockets/Create-Secure-valid-url.htm
@@ -1,34 +1,34 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Create Secure WebSocket with valid url</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL - Connection should be opened"); - var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL - Connection should be closed"); - - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - assert_equals(wsocket.readyState, 1, "readyState should be 1(OPEN)"); - wsocket.close(); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Create Secure WebSocket with valid url</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL - Connection should be opened"); + var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL - Connection should be closed"); + + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + assert_equals(wsocket.readyState, 1, "readyState should be 1(OPEN)"); + wsocket.close(); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + + </script> +</body> +</html> diff --git a/websockets/Create-Secure-verify-url-set-default-port.htm b/websockets/Create-Secure-verify-url-set-default-port.htm index 8f3dbfe..4801722 100644 --- a/websockets/Create-Secure-verify-url-set-default-port.htm +++ b/websockets/Create-Secure-verify-url-set-default-port.htm
@@ -1,26 +1,26 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Create Secure WebSocket - wsocket.url is set correctly - default port</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - test(function () { - // - // The w3c-test web server is already running on port 443 so the Jetty server runs on 8443 - // - // This blocks testing this part of the specification. - // So as a simple work around use the html5 labs public Jetty - // - wsocket = new WebSocket("wss://html5labs-interop.cloudapp.net:443/echo"); - var urlNormalized = "wss://html5labs-interop.cloudapp.net/echo"; - assert_equals(wsocket.url, urlNormalized, "wsocket.url is set correctly"); - wsocket.close(); - }, "W3C WebSocket API - Create Secure WebSocket - wsocket.url should be set correctly") - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Create Secure WebSocket - wsocket.url is set correctly - default port</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + test(function () { + // + // The w3c-test web server is already running on port 443 so the Jetty server runs on 8443 + // + // This blocks testing this part of the specification. + // So as a simple work around use the html5 labs public Jetty + // + wsocket = new WebSocket("wss://html5labs-interop.cloudapp.net:443/echo"); + var urlNormalized = "wss://html5labs-interop.cloudapp.net/echo"; + assert_equals(wsocket.url, urlNormalized, "wsocket.url is set correctly"); + wsocket.close(); + }, "W3C WebSocket API - Create Secure WebSocket - wsocket.url should be set correctly") + </script> +</body> +</html> diff --git a/websockets/Create-Secure-verify-url-set-non-default-port.htm b/websockets/Create-Secure-verify-url-set-non-default-port.htm index 8a8e454..6ae02ec 100644 --- a/websockets/Create-Secure-verify-url-set-non-default-port.htm +++ b/websockets/Create-Secure-verify-url-set-non-default-port.htm
@@ -1,19 +1,19 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Create Secure WebSocket - wsocket.url is set correctly - non default port</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - test(function () { - var urlNonDefaultPort = "wss://" + __SERVER__NAME + ":" + __NEW__SECURE__PORT + "/" + __PATH; - var wsocket = new WebSocket(urlNonDefaultPort); - assert_equals(wsocket.url, urlNonDefaultPort, "wsocket.url is set correctly"); - }, "W3C WebSocket API - Create Secure WebSocket - wsocket.url should be set correctly") - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Create Secure WebSocket - wsocket.url is set correctly - non default port</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + test(function () { + var urlNonDefaultPort = "wss://" + __SERVER__NAME + ":" + __NEW__SECURE__PORT + "/" + __PATH; + var wsocket = new WebSocket(urlNonDefaultPort); + assert_equals(wsocket.url, urlNonDefaultPort, "wsocket.url is set correctly"); + }, "W3C WebSocket API - Create Secure WebSocket - wsocket.url should be set correctly") + </script> +</body> +</html> diff --git a/websockets/Create-invalid-urls.htm b/websockets/Create-invalid-urls.htm index 1fb51d5..483ba29 100644 --- a/websockets/Create-invalid-urls.htm +++ b/websockets/Create-invalid-urls.htm
@@ -1,34 +1,34 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Create WebSocket - pass in list of invalid urls</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - var wsocket; - test(function() { - assert_throws("SYNTAX_ERR", function () { wsocket = new WebSocket("/echo") }); - }, "Url is /echo - should throw SYNTAX_ERR"); - - test(function () { - assert_throws("SYNTAX_ERR", function () { wsocket = new WebSocket("mailto:microsoft@microsoft.com") }); - }, "Url is a mail address - should throw SYNTAX_ERR"); - - test(function () { - assert_throws("SYNTAX_ERR", function () { wsocket = new WebSocket("about:blank") }); - }, "Url is about:blank - should throw SYNTAX_ERR"); - - test(function () { - assert_throws("SYNTAX_ERR", function () { wsocket = new WebSocket("?test") }); - }, "Url is ?test - should throw SYNTAX_ERR"); - - test(function () { - assert_throws("SYNTAX_ERR", function () { wsocket = new WebSocket("#test") }); - }, "Url is #test - should throw SYNTAX_ERR"); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Create WebSocket - pass in list of invalid urls</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + var wsocket; + test(function() { + assert_throws("SYNTAX_ERR", function () { wsocket = new WebSocket("/echo") }); + }, "Url is /echo - should throw SYNTAX_ERR"); + + test(function () { + assert_throws("SYNTAX_ERR", function () { wsocket = new WebSocket("mailto:microsoft@microsoft.com") }); + }, "Url is a mail address - should throw SYNTAX_ERR"); + + test(function () { + assert_throws("SYNTAX_ERR", function () { wsocket = new WebSocket("about:blank") }); + }, "Url is about:blank - should throw SYNTAX_ERR"); + + test(function () { + assert_throws("SYNTAX_ERR", function () { wsocket = new WebSocket("?test") }); + }, "Url is ?test - should throw SYNTAX_ERR"); + + test(function () { + assert_throws("SYNTAX_ERR", function () { wsocket = new WebSocket("#test") }); + }, "Url is #test - should throw SYNTAX_ERR"); + </script> +</body> +</html> diff --git a/websockets/Create-non-absolute-url.htm b/websockets/Create-non-absolute-url.htm index 02de810..9c7f058 100644 --- a/websockets/Create-non-absolute-url.htm +++ b/websockets/Create-non-absolute-url.htm
@@ -1,18 +1,18 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Create WebSocket - non absolute url</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - test(function () { - var wsocket; - assert_throws("SYNTAX_ERR", function () { wsocket = CreateWebSocketNonAbsolute() }); - }, "W3C WebSocket API - Create WebSocket - Pass a non absolute URL - SYNTAX_ERR is thrown") - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Create WebSocket - non absolute url</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + test(function () { + var wsocket; + assert_throws("SYNTAX_ERR", function () { wsocket = CreateWebSocketNonAbsolute() }); + }, "W3C WebSocket API - Create WebSocket - Pass a non absolute URL - SYNTAX_ERR is thrown") + </script> +</body> +</html> diff --git a/websockets/Create-nonAscii-protocol-string.htm b/websockets/Create-nonAscii-protocol-string.htm index 55ca24b..5546469 100644 --- a/websockets/Create-nonAscii-protocol-string.htm +++ b/websockets/Create-nonAscii-protocol-string.htm
@@ -1,21 +1,21 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Create WebSocket - non ascii protocol string</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - if(window.WebSocket) { - test(function () { - var nonAsciiProtocol = "\u0080echo"; - var wsocket; - assert_throws("SYNTAX_ERR", function () { wsocket = CreateWebSocketNonAsciiProtocol(nonAsciiProtocol) }); - }, "W3C WebSocket API - Create WebSocket - Pass a valid URL and a protocol string with non-ascii values - SYNTAX_ERR is thrown") - } - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Create WebSocket - non ascii protocol string</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + if(window.WebSocket) { + test(function () { + var nonAsciiProtocol = "\u0080echo"; + var wsocket; + assert_throws("SYNTAX_ERR", function () { wsocket = CreateWebSocketNonAsciiProtocol(nonAsciiProtocol) }); + }, "W3C WebSocket API - Create WebSocket - Pass a valid URL and a protocol string with non-ascii values - SYNTAX_ERR is thrown") + } + </script> +</body> +</html> diff --git a/websockets/Create-protocol-with-space.htm b/websockets/Create-protocol-with-space.htm index f41a1df..a53be80 100644 --- a/websockets/Create-protocol-with-space.htm +++ b/websockets/Create-protocol-with-space.htm
@@ -1,18 +1,18 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Create WebSocket - protocol with space</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - test(function () { - var wsocket; - assert_throws("SYNTAX_ERR", function () { wsocket = CreateWebSocketWithSpaceInProtocol("ec ho") }); - }, "W3C WebSocket API - Create WebSocket - Pass a valid URL and a protocol string with a space in it - SYNTAX_ERR is thrown") - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Create WebSocket - protocol with space</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + test(function () { + var wsocket; + assert_throws("SYNTAX_ERR", function () { wsocket = CreateWebSocketWithSpaceInProtocol("ec ho") }); + }, "W3C WebSocket API - Create WebSocket - Pass a valid URL and a protocol string with a space in it - SYNTAX_ERR is thrown") + </script> +</body> +</html> diff --git a/websockets/Create-protocols-repeated.htm b/websockets/Create-protocols-repeated.htm index bf8a4f7..bf9fd9f 100644 --- a/websockets/Create-protocols-repeated.htm +++ b/websockets/Create-protocols-repeated.htm
@@ -1,18 +1,18 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Create WebSocket - repeated protocols</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - test(function () { - var wsocket; - assert_throws("SYNTAX_ERR", function () { wsocket = CreateWebSocketWithRepeatedProtocols() }); - }, "W3C WebSocket API - Create WebSocket - Pass a valid URL and an array of protocol strings with repeated values - SYNTAX_ERR is thrown") - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Create WebSocket - repeated protocols</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + test(function () { + var wsocket; + assert_throws("SYNTAX_ERR", function () { wsocket = CreateWebSocketWithRepeatedProtocols() }); + }, "W3C WebSocket API - Create WebSocket - Pass a valid URL and an array of protocol strings with repeated values - SYNTAX_ERR is thrown") + </script> +</body> +</html> diff --git a/websockets/Create-valid-url-array-protocols.htm b/websockets/Create-valid-url-array-protocols.htm index 61a91c8..8e92d24 100644 --- a/websockets/Create-valid-url-array-protocols.htm +++ b/websockets/Create-valid-url-array-protocols.htm
@@ -1,35 +1,35 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Create WebSocket with valid url and array of protocols</title> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Create WebSocket - Pass a valid URL and array of protocol strings - Connection should be opened"); - var testClose = async_test("W3C WebSocket API - Create WebSocket - Pass a valid URL and array of protocol strings - Connection should be closed"); - - var wsocket = CreateWebSocket(false, false, true); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - assert_equals(wsocket.readyState, 1, "readyState should be 1(OPEN)"); - wsocket.close(); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - - </script> - -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Create WebSocket with valid url and array of protocols</title> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Create WebSocket - Pass a valid URL and array of protocol strings - Connection should be opened"); + var testClose = async_test("W3C WebSocket API - Create WebSocket - Pass a valid URL and array of protocol strings - Connection should be closed"); + + var wsocket = CreateWebSocket(false, false, true); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + assert_equals(wsocket.readyState, 1, "readyState should be 1(OPEN)"); + wsocket.close(); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + + </script> + +</body> +</html> diff --git a/websockets/Create-valid-url-protocol-empty.htm b/websockets/Create-valid-url-protocol-empty.htm index f747da1..ad511f5 100644 --- a/websockets/Create-valid-url-protocol-empty.htm +++ b/websockets/Create-valid-url-protocol-empty.htm
@@ -1,19 +1,19 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Create WebSocket - wsocket.protocol is empty before connection is established</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - test(function () { - var wsocket = CreateWebSocket(false, true, false); - assert_equals(wsocket.protocol, "", "protocol should be empty"); - wsocket.close(); - }, "W3C WebSocket API - Create WebSocket - wsocket.protocol should be empty before connection is established") - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Create WebSocket - wsocket.protocol is empty before connection is established</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + test(function () { + var wsocket = CreateWebSocket(false, true, false); + assert_equals(wsocket.protocol, "", "protocol should be empty"); + wsocket.close(); + }, "W3C WebSocket API - Create WebSocket - wsocket.protocol should be empty before connection is established") + </script> +</body> +</html> diff --git a/websockets/Create-valid-url-protocol.htm b/websockets/Create-valid-url-protocol.htm index 7ce8666..8b65fd8 100644 --- a/websockets/Create-valid-url-protocol.htm +++ b/websockets/Create-valid-url-protocol.htm
@@ -1,34 +1,34 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Create WebSocket with a valid url and protocol string</title> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Create WebSocket - Pass a valid URL and a protocol string - Connection should be opened"); - var testClose = async_test("W3C WebSocket API - Create WebSocket - Pass a valid URL and a protocol string - Connection should be closed"); - - var wsocket = CreateWebSocket(false, true, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - assert_equals(wsocket.readyState, 1, "readyState should be 1(OPEN)"); - wsocket.close(); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Create WebSocket with a valid url and protocol string</title> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Create WebSocket - Pass a valid URL and a protocol string - Connection should be opened"); + var testClose = async_test("W3C WebSocket API - Create WebSocket - Pass a valid URL and a protocol string - Connection should be closed"); + + var wsocket = CreateWebSocket(false, true, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + assert_equals(wsocket.readyState, 1, "readyState should be 1(OPEN)"); + wsocket.close(); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + + </script> +</body> +</html> diff --git a/websockets/Create-valid-url.htm b/websockets/Create-valid-url.htm index 2905c5f..7803a6e 100644 --- a/websockets/Create-valid-url.htm +++ b/websockets/Create-valid-url.htm
@@ -1,34 +1,34 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Create WebSocket with valid url</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Create WebSocket - Pass a valid URL - Connection should be opened"); - var testClose = async_test("W3C WebSocket API - Create WebSocket - Pass a valid URL - Connection should be closed"); - - var wsocket = CreateWebSocket(false, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - assert_equals(wsocket.readyState, 1, "readyState should be 1(OPEN)"); - wsocket.close(); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Create WebSocket with valid url</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Create WebSocket - Pass a valid URL - Connection should be opened"); + var testClose = async_test("W3C WebSocket API - Create WebSocket - Pass a valid URL - Connection should be closed"); + + var wsocket = CreateWebSocket(false, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + assert_equals(wsocket.readyState, 1, "readyState should be 1(OPEN)"); + wsocket.close(); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + + </script> +</body> +</html> diff --git a/websockets/Create-verify-url-set-default-port.htm b/websockets/Create-verify-url-set-default-port.htm index 4b8f287..99358ec 100644 --- a/websockets/Create-verify-url-set-default-port.htm +++ b/websockets/Create-verify-url-set-default-port.htm
@@ -1,26 +1,26 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Create WebSocket - wsocket.url is set correctly - default port</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - test(function () { - // - // The w3c-test web server is already running on port 80 so the Jetty server runs on 8080 - // - // This blocks testing this part of the specification. - // So as a simple work around use the html5 labs public Jetty - // - wsocket = new WebSocket("ws://html5labs-interop.cloudapp.net:80/echo"); - var urlNormalized = "ws://html5labs-interop.cloudapp.net/echo"; - assert_equals(wsocket.url, urlNormalized, "wsocket.url is set correctly"); - wsocket.close(); - }, "W3C WebSocket API - Create WebSocket - wsocket.url should be set correctly") - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Create WebSocket - wsocket.url is set correctly - default port</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + test(function () { + // + // The w3c-test web server is already running on port 80 so the Jetty server runs on 8080 + // + // This blocks testing this part of the specification. + // So as a simple work around use the html5 labs public Jetty + // + wsocket = new WebSocket("ws://html5labs-interop.cloudapp.net:80/echo"); + var urlNormalized = "ws://html5labs-interop.cloudapp.net/echo"; + assert_equals(wsocket.url, urlNormalized, "wsocket.url is set correctly"); + wsocket.close(); + }, "W3C WebSocket API - Create WebSocket - wsocket.url should be set correctly") + </script> +</body> +</html> diff --git a/websockets/Create-verify-url-set-non-default-port.htm b/websockets/Create-verify-url-set-non-default-port.htm index 52bb1a2..08a01cb 100644 --- a/websockets/Create-verify-url-set-non-default-port.htm +++ b/websockets/Create-verify-url-set-non-default-port.htm
@@ -1,19 +1,19 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Create WebSocket - wsocket.url is set correctly - non default port</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - test(function () { - var urlNonDefaultPort = "ws://" + __SERVER__NAME + ":" + __NEW__PORT + "/" + __PATH; - var wsocket = new WebSocket(urlNonDefaultPort); - assert_equals(wsocket.url, urlNonDefaultPort, "wsocket.url is set correctly"); - }, "W3C WebSocket API - Create WebSocket - wsocket.url should be set correctly"); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Create WebSocket - wsocket.url is set correctly - non default port</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + test(function () { + var urlNonDefaultPort = "ws://" + __SERVER__NAME + ":" + __NEW__PORT + "/" + __PATH; + var wsocket = new WebSocket(urlNonDefaultPort); + assert_equals(wsocket.url, urlNonDefaultPort, "wsocket.url is set correctly"); + }, "W3C WebSocket API - Create WebSocket - wsocket.url should be set correctly"); + </script> +</body> +</html> diff --git a/websockets/Create-wrong-scheme.htm b/websockets/Create-wrong-scheme.htm index 851c69d..87fae1e 100644 --- a/websockets/Create-wrong-scheme.htm +++ b/websockets/Create-wrong-scheme.htm
@@ -1,18 +1,18 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Create WebSocket - non ws/wss scheme in url</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - test(function () { - var wsocket; - assert_throws("SYNTAX_ERR", function () { wsocket = CreateWebSocketNonWsScheme() }); - }, "W3C WebSocket API - Create WebSocket - Pass a URL with a non ws/wss scheme - SYNTAX_ERR is thrown") - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Create WebSocket - non ws/wss scheme in url</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + test(function () { + var wsocket; + assert_throws("SYNTAX_ERR", function () { wsocket = CreateWebSocketNonWsScheme() }); + }, "W3C WebSocket API - Create WebSocket - Pass a URL with a non ws/wss scheme - SYNTAX_ERR is thrown") + </script> +</body> +</html> diff --git a/websockets/Secure-Close-0.htm b/websockets/Secure-Close-0.htm index ba9b211..1babd4b 100644 --- a/websockets/Secure-Close-0.htm +++ b/websockets/Secure-Close-0.htm
@@ -1,25 +1,25 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Close Secure WebSocket - Code is 0</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var test = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(0) - INVALID_ACCESS_ERR is thrown"); - - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', test.step_func(function (evt) { - assert_throws("INVALID_ACCESS_ERR", function () { wsocket.close(0, "Close not in range 3000-4999") }); - test.done(); - }), true); - </script> - -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Close Secure WebSocket - Code is 0</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var test = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(0) - INVALID_ACCESS_ERR is thrown"); + + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', test.step_func(function (evt) { + assert_throws("INVALID_ACCESS_ERR", function () { wsocket.close(0, "Close not in range 3000-4999") }); + test.done(); + }), true); + </script> + +</body> +</html> diff --git a/websockets/Secure-Close-1000-reason.htm b/websockets/Secure-Close-1000-reason.htm index 629d9ba..750c43c 100644 --- a/websockets/Secure-Close-1000-reason.htm +++ b/websockets/Secure-Close-1000-reason.htm
@@ -1,35 +1,35 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Close Secure WebSocket - Code is 1000 and reason</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000, reason) - Connection should be opened"); - var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000, reason) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed"); - - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.close(1000, "Clean Close"); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(wsocket.readyState, 3, "readyState should be 3(CLOSED)"); - assert_equals(evt.wasClean, true, "wasClean should be TRUE"); - testClose.done(); - }), true); - - </script> - -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Close Secure WebSocket - Code is 1000 and reason</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000, reason) - Connection should be opened"); + var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000, reason) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed"); + + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.close(1000, "Clean Close"); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(wsocket.readyState, 3, "readyState should be 3(CLOSED)"); + assert_equals(evt.wasClean, true, "wasClean should be TRUE"); + testClose.done(); + }), true); + + </script> + +</body> +</html> diff --git a/websockets/Secure-Close-1000-verify-code.htm b/websockets/Secure-Close-1000-verify-code.htm index ec316ac..b0f6c8e 100644 --- a/websockets/Secure-Close-1000-verify-code.htm +++ b/websockets/Secure-Close-1000-verify-code.htm
@@ -1,35 +1,35 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Close Secure WebSocket - Code is 1000 - verify code in CloseEvent is 1000</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000, reason) - Connection should be opened"); - var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000, reason) - event.code == 1000 and event.reason = 'Clean Close'"); - - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.close(1000, "Clean Close"); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.code, 1000, "CloseEvent.code should be 1000"); - assert_equals(evt.reason, "Clean Close", "CloseEvent.reason should be the same as the reason sent in close"); - testClose.done(); - }), true); - - </script> - -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Close Secure WebSocket - Code is 1000 - verify code in CloseEvent is 1000</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000, reason) - Connection should be opened"); + var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000, reason) - event.code == 1000 and event.reason = 'Clean Close'"); + + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.close(1000, "Clean Close"); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.code, 1000, "CloseEvent.code should be 1000"); + assert_equals(evt.reason, "Clean Close", "CloseEvent.reason should be the same as the reason sent in close"); + testClose.done(); + }), true); + + </script> + +</body> +</html> diff --git a/websockets/Secure-Close-1000.htm b/websockets/Secure-Close-1000.htm index 968b675..ebe4f78 100644 --- a/websockets/Secure-Close-1000.htm +++ b/websockets/Secure-Close-1000.htm
@@ -1,35 +1,35 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Close Secure WebSocket - Code is 1000</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000) - Connection should be opened"); - var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed"); - - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.close(1000); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(wsocket.readyState, 3, "readyState should be 3(CLOSED)"); - assert_equals(evt.wasClean, true, "wasClean should be TRUE"); - testClose.done(); - }), true); - - </script> - -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Close Secure WebSocket - Code is 1000</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000) - Connection should be opened"); + var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed"); + + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.close(1000); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(wsocket.readyState, 3, "readyState should be 3(CLOSED)"); + assert_equals(evt.wasClean, true, "wasClean should be TRUE"); + testClose.done(); + }), true); + + </script> + +</body> +</html> diff --git a/websockets/Secure-Close-1005-verify-code.htm b/websockets/Secure-Close-1005-verify-code.htm index 311a6b7..4d2d81c 100644 --- a/websockets/Secure-Close-1005-verify-code.htm +++ b/websockets/Secure-Close-1005-verify-code.htm
@@ -1,35 +1,35 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Close Secure WebSocket - verify return code is 1005</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close() - Connection should be opened"); - var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close() - return close code is 1005 - Connection should be closed"); - - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.close(); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.code, 1005, "CloseEvent.code should be 1005"); - assert_equals(evt.reason, "", "CloseEvent.reason should be empty"); - testClose.done(); - }), true); - - </script> - -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Close Secure WebSocket - verify return code is 1005</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close() - Connection should be opened"); + var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close() - return close code is 1005 - Connection should be closed"); + + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.close(); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.code, 1005, "CloseEvent.code should be 1005"); + assert_equals(evt.reason, "", "CloseEvent.reason should be empty"); + testClose.done(); + }), true); + + </script> + +</body> +</html> diff --git a/websockets/Secure-Close-1005.htm b/websockets/Secure-Close-1005.htm index 7c81dac..7f6f6e1 100644 --- a/websockets/Secure-Close-1005.htm +++ b/websockets/Secure-Close-1005.htm
@@ -1,25 +1,25 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Close Secure WebSocket - Code is 1005</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var test = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1005) - see '7.1.5. The WebSocket Connection Close Code' in http://www.ietf.org/rfc/rfc6455.txt"); - - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', test.step_func(function (evt) { - assert_throws("INVALID_ACCESS_ERR", function () { wsocket.close(1005, "1005 - reserved code") }); - test.done(); - }), true); - </script> - -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Close Secure WebSocket - Code is 1005</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var test = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1005) - see '7.1.5. The WebSocket Connection Close Code' in http://www.ietf.org/rfc/rfc6455.txt"); + + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', test.step_func(function (evt) { + assert_throws("INVALID_ACCESS_ERR", function () { wsocket.close(1005, "1005 - reserved code") }); + test.done(); + }), true); + </script> + +</body> +</html> diff --git a/websockets/Secure-Close-2999-reason.htm b/websockets/Secure-Close-2999-reason.htm index eed3551..0eddc1d 100644 --- a/websockets/Secure-Close-2999-reason.htm +++ b/websockets/Secure-Close-2999-reason.htm
@@ -1,24 +1,24 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Close Secure WebSocket - Code is 2999 and reason</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var test = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(2999, reason) - INVALID_ACCESS_ERR is thrown"); - - var wsocket = CreateWebSocket(true, false, false); - - wsocket.addEventListener('open', test.step_func(function (evt) { - assert_throws("INVALID_ACCESS_ERR", function () { wsocket.close(2999, "Close not in range 3000-4999") }); - test.done(); - }), true); - </script> - -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Close Secure WebSocket - Code is 2999 and reason</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var test = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(2999, reason) - INVALID_ACCESS_ERR is thrown"); + + var wsocket = CreateWebSocket(true, false, false); + + wsocket.addEventListener('open', test.step_func(function (evt) { + assert_throws("INVALID_ACCESS_ERR", function () { wsocket.close(2999, "Close not in range 3000-4999") }); + test.done(); + }), true); + </script> + +</body> +</html> diff --git a/websockets/Secure-Close-3000-reason.htm b/websockets/Secure-Close-3000-reason.htm index 1791174..647bbf2 100644 --- a/websockets/Secure-Close-3000-reason.htm +++ b/websockets/Secure-Close-3000-reason.htm
@@ -1,35 +1,35 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Close Secure WebSocket - Code is 3000 and reason</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(3000, reason) - Connection should be opened"); - var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(3000, reason) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed"); - - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.close(3000, "Clean Close with code - 3000"); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(wsocket.readyState, 3, "readyState should be 3(CLOSED)"); - assert_equals(evt.wasClean, true, "wasClean should be TRUE"); - testClose.done(); - }), true); - - </script> - -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Close Secure WebSocket - Code is 3000 and reason</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(3000, reason) - Connection should be opened"); + var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(3000, reason) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed"); + + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.close(3000, "Clean Close with code - 3000"); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(wsocket.readyState, 3, "readyState should be 3(CLOSED)"); + assert_equals(evt.wasClean, true, "wasClean should be TRUE"); + testClose.done(); + }), true); + + </script> + +</body> +</html> diff --git a/websockets/Secure-Close-3000-verify-code.htm b/websockets/Secure-Close-3000-verify-code.htm index 3fcce05..5a13d44 100644 --- a/websockets/Secure-Close-3000-verify-code.htm +++ b/websockets/Secure-Close-3000-verify-code.htm
@@ -1,34 +1,34 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Close Secure WebSocket - Code is 3000 - verify code in CloseEvent is 3000</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(3000, reason) - Connection should be opened"); - var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(3000, reason) - verify return code is 3000 - Connection should be closed"); - - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.close(3000, "Clean Close"); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.code, 3000, "CloseEvent.code should be 3000"); - testClose.done(); - }), true); - - </script> - -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Close Secure WebSocket - Code is 3000 - verify code in CloseEvent is 3000</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(3000, reason) - Connection should be opened"); + var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(3000, reason) - verify return code is 3000 - Connection should be closed"); + + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.close(3000, "Clean Close"); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.code, 3000, "CloseEvent.code should be 3000"); + testClose.done(); + }), true); + + </script> + +</body> +</html> diff --git a/websockets/Secure-Close-4999-reason.htm b/websockets/Secure-Close-4999-reason.htm index 05c059a..cfa5693 100644 --- a/websockets/Secure-Close-4999-reason.htm +++ b/websockets/Secure-Close-4999-reason.htm
@@ -1,35 +1,35 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Close Secure WebSocket - Code is 4999 and reason</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(4999, reason) - Connection should be opened"); - var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(4999, reason) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed"); - - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.close(3000, "Clean Close with code - 4999"); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(wsocket.readyState, 3, "readyState should be 3(CLOSED)"); - assert_equals(evt.wasClean, true, "wasClean should be TRUE"); - testClose.done(); - }), true); - - </script> - -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Close Secure WebSocket - Code is 4999 and reason</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(4999, reason) - Connection should be opened"); + var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(4999, reason) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed"); + + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.close(3000, "Clean Close with code - 4999"); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(wsocket.readyState, 3, "readyState should be 3(CLOSED)"); + assert_equals(evt.wasClean, true, "wasClean should be TRUE"); + testClose.done(); + }), true); + + </script> + +</body> +</html> diff --git a/websockets/Secure-Close-Reason-124Bytes.htm b/websockets/Secure-Close-Reason-124Bytes.htm index 8e6a98d..0c0c1b5 100644 --- a/websockets/Secure-Close-Reason-124Bytes.htm +++ b/websockets/Secure-Close-Reason-124Bytes.htm
@@ -1,27 +1,27 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Close Secure WebSocket - Reason is more than 123 bytes long</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var test = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(code, 'reason more than 123 bytes') - SYNTAX_ERR is thrown"); - - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', test.step_func(function (evt) { - var reason = "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123"; - assert_equals(reason.length, 124); - assert_throws("SYNTAX_ERR", function () { wsocket.close(1000, reason) }); - test.done(); - }), true); - </script> - -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Close Secure WebSocket - Reason is more than 123 bytes long</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var test = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(code, 'reason more than 123 bytes') - SYNTAX_ERR is thrown"); + + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', test.step_func(function (evt) { + var reason = "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123"; + assert_equals(reason.length, 124); + assert_throws("SYNTAX_ERR", function () { wsocket.close(1000, reason) }); + test.done(); + }), true); + </script> + +</body> +</html> diff --git a/websockets/Secure-Close-Reason-Unpaired-surrogates.htm b/websockets/Secure-Close-Reason-Unpaired-surrogates.htm index a4fd9f2..c3d9aef 100644 --- a/websockets/Secure-Close-Reason-Unpaired-surrogates.htm +++ b/websockets/Secure-Close-Reason-Unpaired-surrogates.htm
@@ -1,35 +1,35 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Close Secure WebSocket - Reason with unpaired surrogates</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get opened"); - var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get closed"); - - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - var reason = "\uD807"; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.close(1000, reason); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be opened"); - testClose.done(); - }), true); - - </script> - -</body> -</html> - +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Close Secure WebSocket - Reason with unpaired surrogates</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get opened"); + var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get closed"); + + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + var reason = "\uD807"; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.close(1000, reason); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be opened"); + testClose.done(); + }), true); + + </script> + +</body> +</html> + diff --git a/websockets/Secure-Close-null.htm b/websockets/Secure-Close-null.htm index 8ecd111..30f4935 100644 --- a/websockets/Secure-Close-null.htm +++ b/websockets/Secure-Close-null.htm
@@ -1,25 +1,25 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Close Secure WebSocket - Code is null</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var test = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - close(null) - INVALID_ACCESS_ERR is thrown"); - - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', test.step_func(function (evt) { - assert_throws("INVALID_ACCESS_ERR", function () { wsocket.close(null) }); - test.done(); - }), true); - </script> - -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Close Secure WebSocket - Code is null</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var test = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - close(null) - INVALID_ACCESS_ERR is thrown"); + + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', test.step_func(function (evt) { + assert_throws("INVALID_ACCESS_ERR", function () { wsocket.close(null) }); + test.done(); + }), true); + </script> + +</body> +</html> diff --git a/websockets/Secure-Close-onlyReason.htm b/websockets/Secure-Close-onlyReason.htm index 095f3a6..cad4932 100644 --- a/websockets/Secure-Close-onlyReason.htm +++ b/websockets/Secure-Close-onlyReason.htm
@@ -1,24 +1,24 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Close Secure WebSocket - Only reason</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var test = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(only reason) - INVALID_ACCESS_ERR is thrown"); - - var wsocket = CreateWebSocket(true, false, false); - - wsocket.addEventListener('open', test.step_func(function (evt) { - assert_throws("INVALID_ACCESS_ERR", function () { wsocket.close("Close with only reason") }); - test.done(); - }), true); - </script> - -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Close Secure WebSocket - Only reason</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var test = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(only reason) - INVALID_ACCESS_ERR is thrown"); + + var wsocket = CreateWebSocket(true, false, false); + + wsocket.addEventListener('open', test.step_func(function (evt) { + assert_throws("INVALID_ACCESS_ERR", function () { wsocket.close("Close with only reason") }); + test.done(); + }), true); + </script> + +</body> +</html> diff --git a/websockets/Secure-Close-readyState-Closed.htm b/websockets/Secure-Close-readyState-Closed.htm index 3de891c..3e7b09c 100644 --- a/websockets/Secure-Close-readyState-Closed.htm +++ b/websockets/Secure-Close-readyState-Closed.htm
@@ -1,35 +1,35 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Close Secure WebSocket - verify readyState is 3 when onclose is fired</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - Connection should be opened"); - var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed"); - - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.close(); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(wsocket.readyState, 3, "readyState should be 3(CLOSED)"); - assert_equals(evt.wasClean, true, "wasClean should be TRUE"); - testClose.done(); - }), true); - - </script> - -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Close Secure WebSocket - verify readyState is 3 when onclose is fired</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - Connection should be opened"); + var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed"); + + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.close(); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(wsocket.readyState, 3, "readyState should be 3(CLOSED)"); + assert_equals(evt.wasClean, true, "wasClean should be TRUE"); + testClose.done(); + }), true); + + </script> + +</body> +</html> diff --git a/websockets/Secure-Close-readyState-Closing.htm b/websockets/Secure-Close-readyState-Closing.htm index 8d39677..0e085c6 100644 --- a/websockets/Secure-Close-readyState-Closing.htm +++ b/websockets/Secure-Close-readyState-Closing.htm
@@ -1,27 +1,27 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Close Secure WebSocket - verify readyState is 2 before onclose is fired</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var test = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - readyState should be in CLOSING state just before onclose is called"); - - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', test.step_func(function (evt) { - wsocket.close(); - assert_equals(wsocket.readyState, 2, "readyState should be 2(CLOSING)"); - test.done(); - }), true); - - </script> - -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Close Secure WebSocket - verify readyState is 2 before onclose is fired</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var test = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - readyState should be in CLOSING state just before onclose is called"); + + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', test.step_func(function (evt) { + wsocket.close(); + assert_equals(wsocket.readyState, 2, "readyState should be 2(CLOSING)"); + test.done(); + }), true); + + </script> + +</body> +</html> diff --git a/websockets/Secure-Close-server-initiated-close.htm b/websockets/Secure-Close-server-initiated-close.htm index e0b207a..2fa07bb 100644 --- a/websockets/Secure-Close-server-initiated-close.htm +++ b/websockets/Secure-Close-server-initiated-close.htm
@@ -1,35 +1,35 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Close Secure WebSocket - Server Initiated close</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Server initiated Close - Client sends back a CLOSE - Connection should be opened"); - var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Server initiated Close - Client sends back a CLOSE - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed"); - - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.send(".close"); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(wsocket.readyState, 3, "readyState should be 3(CLOSED)"); - assert_equals(evt.wasClean, true, "wasClean should be TRUE"); - testClose.done(); - }), true); - - </script> - -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Close Secure WebSocket - Server Initiated close</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Server initiated Close - Client sends back a CLOSE - Connection should be opened"); + var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Server initiated Close - Client sends back a CLOSE - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed"); + + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.send(".close"); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(wsocket.readyState, 3, "readyState should be 3(CLOSED)"); + assert_equals(evt.wasClean, true, "wasClean should be TRUE"); + testClose.done(); + }), true); + + </script> + +</body> +</html> diff --git a/websockets/Secure-Close-undefined.htm b/websockets/Secure-Close-undefined.htm index 1a0adf3..ef4a874 100644 --- a/websockets/Secure-Close-undefined.htm +++ b/websockets/Secure-Close-undefined.htm
@@ -1,25 +1,25 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Close Secure WebSocket - Code is undefined</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var test = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(undefined) - INVALID_ACCESS_ERR is thrown"); - - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', test.step_func(function (evt) { - assert_throws("INVALID_ACCESS_ERR", function () { wsocket.close(undefined) }); - test.done(); - }), true); - </script> - -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Close Secure WebSocket - Code is undefined</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var test = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(undefined) - INVALID_ACCESS_ERR is thrown"); + + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', test.step_func(function (evt) { + assert_throws("INVALID_ACCESS_ERR", function () { wsocket.close(undefined) }); + test.done(); + }), true); + </script> + +</body> +</html> diff --git a/websockets/Secure-Send-65K-data.htm b/websockets/Secure-Send-65K-data.htm index 0a220e8..cbbf5c2 100644 --- a/websockets/Secure-Send-65K-data.htm +++ b/websockets/Secure-Send-65K-data.htm
@@ -1,44 +1,44 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send 65K data - Secure WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send 65K data on a Secure WebSocket - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send 65K data on a Secure WebSocket - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send 65K data on a Secure WebSocket - Connection should be closed"); - - var data = ""; - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - for (var i = 0; i < 65000; i++) { - data = data + "c"; - } - wsocket.send(data); - assert_equals(data.length, wsocket.bufferedAmount); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - assert_equals(evt.data, data); - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send 65K data - Secure WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send 65K data on a Secure WebSocket - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send 65K data on a Secure WebSocket - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send 65K data on a Secure WebSocket - Connection should be closed"); + + var data = ""; + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + for (var i = 0; i < 65000; i++) { + data = data + "c"; + } + wsocket.send(data); + assert_equals(data.length, wsocket.bufferedAmount); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + assert_equals(evt.data, data); + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/Secure-Send-binary-65K-arraybuffer.htm b/websockets/Secure-Send-binary-65K-arraybuffer.htm index 8c0c5e0..bd488f0 100644 --- a/websockets/Secure-Send-binary-65K-arraybuffer.htm +++ b/websockets/Secure-Send-binary-65K-arraybuffer.htm
@@ -1,44 +1,44 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send 65K binary data - ArrayBuffer - Secure WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send 65K binary data on a Secure WebSocket - ArrayBuffer - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send 65K binary data on a Secure WebSocket - ArrayBuffer - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send 65K binary data on a Secure WebSocket - ArrayBuffer - Connection should be closed"); - - var data = ""; - var datasize = 65000; - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.binaryType = "arraybuffer"; - data = new ArrayBuffer(datasize); - wsocket.send(data); - assert_equals(datasize, wsocket.bufferedAmount); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - assert_equals(evt.data.byteLength, datasize); - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send 65K binary data - ArrayBuffer - Secure WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send 65K binary data on a Secure WebSocket - ArrayBuffer - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send 65K binary data on a Secure WebSocket - ArrayBuffer - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send 65K binary data on a Secure WebSocket - ArrayBuffer - Connection should be closed"); + + var data = ""; + var datasize = 65000; + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.binaryType = "arraybuffer"; + data = new ArrayBuffer(datasize); + wsocket.send(data); + assert_equals(datasize, wsocket.bufferedAmount); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + assert_equals(evt.data.byteLength, datasize); + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/Secure-Send-binary-arraybuffer.htm b/websockets/Secure-Send-binary-arraybuffer.htm index 4401753..9c81e46 100644 --- a/websockets/Secure-Send-binary-arraybuffer.htm +++ b/websockets/Secure-Send-binary-arraybuffer.htm
@@ -1,44 +1,44 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send binary data - ArrayBuffer - Secure WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send binary data on a Secure WebSocket - ArrayBuffer - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send binary data on a Secure WebSocket - ArrayBuffer - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send binary data on a Secure WebSocket - ArrayBuffer - Connection should be closed"); - - var data = ""; - var datasize = 15; - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.binaryType = "arraybuffer"; - data = new ArrayBuffer(datasize); - wsocket.send(data); - assert_equals(datasize, wsocket.bufferedAmount); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - assert_equals(evt.data.byteLength, datasize); - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send binary data - ArrayBuffer - Secure WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send binary data on a Secure WebSocket - ArrayBuffer - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send binary data on a Secure WebSocket - ArrayBuffer - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send binary data on a Secure WebSocket - ArrayBuffer - Connection should be closed"); + + var data = ""; + var datasize = 15; + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.binaryType = "arraybuffer"; + data = new ArrayBuffer(datasize); + wsocket.send(data); + assert_equals(datasize, wsocket.bufferedAmount); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + assert_equals(evt.data.byteLength, datasize); + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/Secure-Send-binary-arraybufferview-float32.htm b/websockets/Secure-Send-binary-arraybufferview-float32.htm index 9645f34..04a723d 100644 --- a/websockets/Secure-Send-binary-arraybufferview-float32.htm +++ b/websockets/Secure-Send-binary-arraybufferview-float32.htm
@@ -1,51 +1,51 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send binary data - ArrayBufferView - Float32Array - WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float32Array - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float32Array - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float32Array - Connection should be closed"); - - var data = ""; - var datasize = 8; - var view; - var wsocket = CreateWebSocket(false, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.binaryType = "arraybuffer"; - data = new ArrayBuffer(datasize); - view = new Float32Array(data); - for(var i = 0; i < 2; i++) { - view[i] = i; - } - wsocket.send(view); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - var resultView = new Float32Array(evt.data); - for(var i = 0; i < resultView.length; i++) { - assert_equals(resultView[i], view[i], "ArrayBufferView returned is the same"); - } - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send binary data - ArrayBufferView - Float32Array - WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float32Array - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float32Array - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float32Array - Connection should be closed"); + + var data = ""; + var datasize = 8; + var view; + var wsocket = CreateWebSocket(false, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.binaryType = "arraybuffer"; + data = new ArrayBuffer(datasize); + view = new Float32Array(data); + for(var i = 0; i < 2; i++) { + view[i] = i; + } + wsocket.send(view); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + var resultView = new Float32Array(evt.data); + for(var i = 0; i < resultView.length; i++) { + assert_equals(resultView[i], view[i], "ArrayBufferView returned is the same"); + } + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/Secure-Send-binary-arraybufferview-float64.htm b/websockets/Secure-Send-binary-arraybufferview-float64.htm index c8cd415..61b787c 100644 --- a/websockets/Secure-Send-binary-arraybufferview-float64.htm +++ b/websockets/Secure-Send-binary-arraybufferview-float64.htm
@@ -1,51 +1,51 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send binary data - ArrayBufferView - Float32Array - WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float64Array - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float64Array - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float64Array - Connection should be closed"); - - var data = ""; - var datasize = 8; - var view; - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.binaryType = "arraybuffer"; - data = new ArrayBuffer(datasize); - view = new Float64Array(data); - for(var i = 0; i < 1; i++) { - view[i] = i; - } - wsocket.send(view); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - var resultView = new Float64Array(evt.data); - for(var i = 0; i < resultView.length; i++) { - assert_equals(resultView[i], view[i], "ArrayBufferView returned is the same"); - } - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send binary data - ArrayBufferView - Float32Array - WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float64Array - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float64Array - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float64Array - Connection should be closed"); + + var data = ""; + var datasize = 8; + var view; + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.binaryType = "arraybuffer"; + data = new ArrayBuffer(datasize); + view = new Float64Array(data); + for(var i = 0; i < 1; i++) { + view[i] = i; + } + wsocket.send(view); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + var resultView = new Float64Array(evt.data); + for(var i = 0; i < resultView.length; i++) { + assert_equals(resultView[i], view[i], "ArrayBufferView returned is the same"); + } + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/Secure-Send-binary-arraybufferview-int32.htm b/websockets/Secure-Send-binary-arraybufferview-int32.htm index ac082ad..aabcaa2 100644 --- a/websockets/Secure-Send-binary-arraybufferview-int32.htm +++ b/websockets/Secure-Send-binary-arraybufferview-int32.htm
@@ -1,51 +1,51 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send binary data - ArrayBufferView - Int32Array - WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int32Array - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int32Array - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int32Array - Connection should be closed"); - - var data = ""; - var datasize = 8; - var view; - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.binaryType = "arraybuffer"; - data = new ArrayBuffer(datasize); - view = new Int32Array(data); - for(var i = 0; i < 2; i++) { - view[i] = i; - } - wsocket.send(view); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - var resultView = new Int32Array(evt.data); - for(var i = 0; i < resultView.length; i++) { - assert_equals(resultView[i], view[i], "ArrayBufferView returned is the same"); - } - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send binary data - ArrayBufferView - Int32Array - WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int32Array - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int32Array - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int32Array - Connection should be closed"); + + var data = ""; + var datasize = 8; + var view; + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.binaryType = "arraybuffer"; + data = new ArrayBuffer(datasize); + view = new Int32Array(data); + for(var i = 0; i < 2; i++) { + view[i] = i; + } + wsocket.send(view); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + var resultView = new Int32Array(evt.data); + for(var i = 0; i < resultView.length; i++) { + assert_equals(resultView[i], view[i], "ArrayBufferView returned is the same"); + } + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/Secure-Send-binary-arraybufferview-uint16-offset-length.htm b/websockets/Secure-Send-binary-arraybufferview-uint16-offset-length.htm index 5846723..43b8146 100644 --- a/websockets/Secure-Send-binary-arraybufferview-uint16-offset-length.htm +++ b/websockets/Secure-Send-binary-arraybufferview-uint16-offset-length.htm
@@ -1,51 +1,51 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send binary data - ArrayBufferView - Uint16Array with offset and length - WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint16Array with offset and length - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint16Array with offset and length - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint16Array with offset and length - Connection should be closed"); - - var data = ""; - var datasize = 8; - var view; - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.binaryType = "arraybuffer"; - data = new ArrayBuffer(datasize); - view = new Uint16Array(data, 2, 2); - for(var i = 0; i < 4; i++) { - view[i] = i; - } - wsocket.send(view); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - var resultView = new Uint16Array(evt.data); - for(var i = 0; i < resultView.length; i++) { - assert_equals(resultView[i], view[i], "ArrayBufferView returned is the same"); - } - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send binary data - ArrayBufferView - Uint16Array with offset and length - WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint16Array with offset and length - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint16Array with offset and length - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint16Array with offset and length - Connection should be closed"); + + var data = ""; + var datasize = 8; + var view; + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.binaryType = "arraybuffer"; + data = new ArrayBuffer(datasize); + view = new Uint16Array(data, 2, 2); + for(var i = 0; i < 4; i++) { + view[i] = i; + } + wsocket.send(view); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + var resultView = new Uint16Array(evt.data); + for(var i = 0; i < resultView.length; i++) { + assert_equals(resultView[i], view[i], "ArrayBufferView returned is the same"); + } + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/Secure-Send-binary-arraybufferview-uint32-offset.htm b/websockets/Secure-Send-binary-arraybufferview-uint32-offset.htm index ae315f3..a411ea2 100644 --- a/websockets/Secure-Send-binary-arraybufferview-uint32-offset.htm +++ b/websockets/Secure-Send-binary-arraybufferview-uint32-offset.htm
@@ -1,51 +1,51 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send binary data - ArrayBufferView - Uint32Array with offset - WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint32Array with offset - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint32Array with offset - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint32Array with offset - Connection should be closed"); - - var data = ""; - var datasize = 8; - var view; - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.binaryType = "arraybuffer"; - data = new ArrayBuffer(datasize); - view = new Uint32Array(data, 0); - for(var i = 0; i < 2; i++) { - view[i] = i; - } - wsocket.send(view); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - var resultView = new Uint32Array(evt.data); - for(var i = 0; i < resultView.length; i++) { - assert_equals(resultView[i], view[i], "ArrayBufferView returned is the same"); - } - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send binary data - ArrayBufferView - Uint32Array with offset - WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint32Array with offset - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint32Array with offset - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint32Array with offset - Connection should be closed"); + + var data = ""; + var datasize = 8; + var view; + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.binaryType = "arraybuffer"; + data = new ArrayBuffer(datasize); + view = new Uint32Array(data, 0); + for(var i = 0; i < 2; i++) { + view[i] = i; + } + wsocket.send(view); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + var resultView = new Uint32Array(evt.data); + for(var i = 0; i < resultView.length; i++) { + assert_equals(resultView[i], view[i], "ArrayBufferView returned is the same"); + } + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/Secure-Send-binary-arraybufferview-uint8-offset-length.htm b/websockets/Secure-Send-binary-arraybufferview-uint8-offset-length.htm index 24780b1..afcd3b9 100644 --- a/websockets/Secure-Send-binary-arraybufferview-uint8-offset-length.htm +++ b/websockets/Secure-Send-binary-arraybufferview-uint8-offset-length.htm
@@ -1,51 +1,51 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send binary data - ArrayBufferView - Uint8Array with offset and length - WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset and length - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset and length - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset and length - Connection should be closed"); - - var data = ""; - var datasize = 8; - var view; - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.binaryType = "arraybuffer"; - data = new ArrayBuffer(datasize); - view = new Uint8Array(data, 2, 4); - for(var i = 0; i < 8; i++) { - view[i] = i; - } - wsocket.send(view); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - var resultView = new Uint8Array(evt.data); - for(var i = 0; i < resultView.length; i++) { - assert_equals(resultView[i], view[i], "ArrayBufferView returned is the same"); - } - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send binary data - ArrayBufferView - Uint8Array with offset and length - WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset and length - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset and length - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset and length - Connection should be closed"); + + var data = ""; + var datasize = 8; + var view; + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.binaryType = "arraybuffer"; + data = new ArrayBuffer(datasize); + view = new Uint8Array(data, 2, 4); + for(var i = 0; i < 8; i++) { + view[i] = i; + } + wsocket.send(view); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + var resultView = new Uint8Array(evt.data); + for(var i = 0; i < resultView.length; i++) { + assert_equals(resultView[i], view[i], "ArrayBufferView returned is the same"); + } + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/Secure-Send-binary-arraybufferview-uint8-offset.htm b/websockets/Secure-Send-binary-arraybufferview-uint8-offset.htm index 6930011..cc4546c 100644 --- a/websockets/Secure-Send-binary-arraybufferview-uint8-offset.htm +++ b/websockets/Secure-Send-binary-arraybufferview-uint8-offset.htm
@@ -1,51 +1,51 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send binary data - ArrayBufferView - Uint8Array with offset - WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset - Connection should be closed"); - - var data = ""; - var datasize = 8; - var view; - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.binaryType = "arraybuffer"; - data = new ArrayBuffer(datasize); - view = new Uint8Array(data, 2); - for(var i = 0; i < 8; i++) { - view[i] = i; - } - wsocket.send(view); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - var resultView = new Uint8Array(evt.data); - for(var i = 0; i < resultView.length; i++) { - assert_equals(resultView[i], view[i], "ArrayBufferView returned is the same"); - } - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send binary data - ArrayBufferView - Uint8Array with offset - WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset - Connection should be closed"); + + var data = ""; + var datasize = 8; + var view; + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.binaryType = "arraybuffer"; + data = new ArrayBuffer(datasize); + view = new Uint8Array(data, 2); + for(var i = 0; i < 8; i++) { + view[i] = i; + } + wsocket.send(view); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + var resultView = new Uint8Array(evt.data); + for(var i = 0; i < resultView.length; i++) { + assert_equals(resultView[i], view[i], "ArrayBufferView returned is the same"); + } + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/Secure-Send-binary-blob.htm b/websockets/Secure-Send-binary-blob.htm index d789fc6..ca1d2a2 100644 --- a/websockets/Secure-Send-binary-blob.htm +++ b/websockets/Secure-Send-binary-blob.htm
@@ -1,46 +1,46 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send binary data - Blob - Secure WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send binary data on a Secure WebSocket - Blob - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send binary data on a Secure WebSocket - Blob - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send binary data on a Secure WebSocket - Blob - Connection should be closed"); - - var data = ""; - var datasize = 65000; - var isOpenCalled = false; - - var wsocket = CreateWebSocket(true, false, false); - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.binaryType = "blob"; - data = new ArrayBuffer(datasize); - isOpenCalled = true; - wsocket.send(data); - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - assert_true(evt.data instanceof Blob); - assert_equals(evt.data.size, datasize); - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_true(evt.wasClean, "wasClean should be true"); - testClose.done(); - }), true); - - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send binary data - Blob - Secure WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send binary data on a Secure WebSocket - Blob - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send binary data on a Secure WebSocket - Blob - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send binary data on a Secure WebSocket - Blob - Connection should be closed"); + + var data = ""; + var datasize = 65000; + var isOpenCalled = false; + + var wsocket = CreateWebSocket(true, false, false); + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.binaryType = "blob"; + data = new ArrayBuffer(datasize); + isOpenCalled = true; + wsocket.send(data); + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + assert_true(evt.data instanceof Blob); + assert_equals(evt.data.size, datasize); + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_true(evt.wasClean, "wasClean should be true"); + testClose.done(); + }), true); + + </script> +</body> +</html> diff --git a/websockets/Secure-Send-data.htm b/websockets/Secure-Send-data.htm index a9eaea5..14381e8 100644 --- a/websockets/Secure-Send-data.htm +++ b/websockets/Secure-Send-data.htm
@@ -1,41 +1,41 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send data - Secure WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send data on a Secure WebSocket - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send data on a Secure WebSocket - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send data on a Secure WebSocket - Connection should be closed"); - - var data = "Message to send"; - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.send(data); - assert_equals(data.length, wsocket.bufferedAmount); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - assert_equals(evt.data, data); - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send data - Secure WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send data on a Secure WebSocket - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send data on a Secure WebSocket - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send data on a Secure WebSocket - Connection should be closed"); + + var data = "Message to send"; + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.send(data); + assert_equals(data.length, wsocket.bufferedAmount); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + assert_equals(evt.data, data); + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/Secure-Send-null.htm b/websockets/Secure-Send-null.htm index fb5974f..1adf3c9 100644 --- a/websockets/Secure-Send-null.htm +++ b/websockets/Secure-Send-null.htm
@@ -1,43 +1,43 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send null data - Secure WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send null data on a Secure WebSocket - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send null data on a Secure WebSocket - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send null data on a Secure WebSocket - Connection should be closed"); - - var data = null; - var nullReturned = false; - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.send(data); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - if ("null" == evt.data || "" == evt.data) - nullReturned = true; - assert_true(nullReturned); - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send null data - Secure WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send null data on a Secure WebSocket - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send null data on a Secure WebSocket - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send null data on a Secure WebSocket - Connection should be closed"); + + var data = null; + var nullReturned = false; + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.send(data); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + if ("null" == evt.data || "" == evt.data) + nullReturned = true; + assert_true(nullReturned); + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/Secure-Send-paired-surrogates.htm b/websockets/Secure-Send-paired-surrogates.htm index 5bef421..4261815 100644 --- a/websockets/Secure-Send-paired-surrogates.htm +++ b/websockets/Secure-Send-paired-surrogates.htm
@@ -1,41 +1,41 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send (paired surrogates) data - Secure WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send paired surrogates data on a Secure WebSocket - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send paired surrogates data on a Secure WebSocket - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send paired surrogates data on a Secure WebSocket - Connection should be closed"); - - var data = "\uD801\uDC07"; - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.send(data); - assert_equals(data.length * 2, wsocket.bufferedAmount); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - assert_equals(evt.data, data); - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send (paired surrogates) data - Secure WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send paired surrogates data on a Secure WebSocket - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send paired surrogates data on a Secure WebSocket - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send paired surrogates data on a Secure WebSocket - Connection should be closed"); + + var data = "\uD801\uDC07"; + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.send(data); + assert_equals(data.length * 2, wsocket.bufferedAmount); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + assert_equals(evt.data, data); + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/Secure-Send-unicode-data.htm b/websockets/Secure-Send-unicode-data.htm index e187e07..01555e0 100644 --- a/websockets/Secure-Send-unicode-data.htm +++ b/websockets/Secure-Send-unicode-data.htm
@@ -1,41 +1,41 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send unicode data - Secure WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send unicode data on a Secure WebSocket - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send unicode data on a Secure WebSocket - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send unicode data on a Secure WebSocket - Connection should be closed"); - - var data = "¥¥¥¥¥¥"; - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.send(data); - assert_equals(data.length * 2, wsocket.bufferedAmount); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - assert_equals(evt.data, data); - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send unicode data - Secure WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send unicode data on a Secure WebSocket - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send unicode data on a Secure WebSocket - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send unicode data on a Secure WebSocket - Connection should be closed"); + + var data = "¥¥¥¥¥¥"; + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.send(data); + assert_equals(data.length * 2, wsocket.bufferedAmount); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + assert_equals(evt.data, data); + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/Secure-Send-unpaired-surrogates.htm b/websockets/Secure-Send-unpaired-surrogates.htm index 5f13b6d..99dfbd3 100644 --- a/websockets/Secure-Send-unpaired-surrogates.htm +++ b/websockets/Secure-Send-unpaired-surrogates.htm
@@ -1,41 +1,41 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send unpaired surrogates - Secure WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send unpaired surrogates on a Secure WebSocket - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send unpaired surrogates on a Secure WebSocket - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send unpaired surrogates on a Secure WebSocket - Connection should be closed"); - - var data = "\uD807"; - var replacementChar = "\uFFFD"; - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.send(data); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - assert_equals(evt.data, replacementChar); - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send unpaired surrogates - Secure WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send unpaired surrogates on a Secure WebSocket - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send unpaired surrogates on a Secure WebSocket - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send unpaired surrogates on a Secure WebSocket - Connection should be closed"); + + var data = "\uD807"; + var replacementChar = "\uFFFD"; + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.send(data); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + assert_equals(evt.data, replacementChar); + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/Send-0byte-data.htm b/websockets/Send-0byte-data.htm index 6f6f4e9..328816f 100644 --- a/websockets/Send-0byte-data.htm +++ b/websockets/Send-0byte-data.htm
@@ -1,41 +1,41 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send 0 byte data - WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send 0 byte data on a WebSocket - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send 0 byte data on a WebSocket - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send 0 byte data on a WebSocket - Connection should be closed"); - - var data = ""; - var wsocket = CreateWebSocket(false, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.send(data); - assert_equals(data.length, wsocket.bufferedAmount); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - assert_equals(evt.data, data); - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send 0 byte data - WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send 0 byte data on a WebSocket - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send 0 byte data on a WebSocket - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send 0 byte data on a WebSocket - Connection should be closed"); + + var data = ""; + var wsocket = CreateWebSocket(false, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.send(data); + assert_equals(data.length, wsocket.bufferedAmount); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + assert_equals(evt.data, data); + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/Send-65K-data.htm b/websockets/Send-65K-data.htm index 89f4348..151af2d 100644 --- a/websockets/Send-65K-data.htm +++ b/websockets/Send-65K-data.htm
@@ -1,44 +1,44 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send 65K data - WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send 65K data on a WebSocket - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send 65K data on a WebSocket - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send 65K data on a WebSocket - Connection should be closed"); - - var data = ""; - var wsocket = CreateWebSocket(false, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - for (var i = 0; i < 65000; i++) { - data = data + "c"; - } - wsocket.send(data); - assert_equals(data.length, wsocket.bufferedAmount); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - assert_equals(evt.data, data); - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send 65K data - WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send 65K data on a WebSocket - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send 65K data on a WebSocket - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send 65K data on a WebSocket - Connection should be closed"); + + var data = ""; + var wsocket = CreateWebSocket(false, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + for (var i = 0; i < 65000; i++) { + data = data + "c"; + } + wsocket.send(data); + assert_equals(data.length, wsocket.bufferedAmount); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + assert_equals(evt.data, data); + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/Send-Unpaired-Surrogates.htm b/websockets/Send-Unpaired-Surrogates.htm index 5d323f4..3e70923 100644 --- a/websockets/Send-Unpaired-Surrogates.htm +++ b/websockets/Send-Unpaired-Surrogates.htm
@@ -1,41 +1,41 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send unpaired surrogates - WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send unpaired surrogates on a WebSocket - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send unpaired surrogates on a WebSocket - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send unpaired surrogates on a WebSocket - Connection should be closed"); - - var data = "\uD807"; - var replacementChar = "\uFFFD"; - var wsocket = CreateWebSocket(false, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.send(data); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - assert_equals(evt.data, replacementChar); - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send unpaired surrogates - WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send unpaired surrogates on a WebSocket - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send unpaired surrogates on a WebSocket - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send unpaired surrogates on a WebSocket - Connection should be closed"); + + var data = "\uD807"; + var replacementChar = "\uFFFD"; + var wsocket = CreateWebSocket(false, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.send(data); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + assert_equals(evt.data, replacementChar); + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/Send-before-open.htm b/websockets/Send-before-open.htm index 65f2f70..23a9460 100644 --- a/websockets/Send-before-open.htm +++ b/websockets/Send-before-open.htm
@@ -1,18 +1,18 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send WebSocket - Send before connection in established</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - test(function () { - var wsocket = CreateWebSocket(false, false, false); - assert_throws("INVALID_STATE_ERR", function () { wsocket.send("Message to send") }); - }, "W3C WebSocket API - Send data on a WebSocket before connection is opened - INVALID_STATE_ERR is returned") - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send WebSocket - Send before connection in established</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + test(function () { + var wsocket = CreateWebSocket(false, false, false); + assert_throws("INVALID_STATE_ERR", function () { wsocket.send("Message to send") }); + }, "W3C WebSocket API - Send data on a WebSocket before connection is opened - INVALID_STATE_ERR is returned") + </script> +</body> +</html> diff --git a/websockets/Send-binary-65K-arraybuffer.htm b/websockets/Send-binary-65K-arraybuffer.htm index 64e86ea..e4d2684 100644 --- a/websockets/Send-binary-65K-arraybuffer.htm +++ b/websockets/Send-binary-65K-arraybuffer.htm
@@ -1,44 +1,44 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send 65K binary data - ArrayBuffer - WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send 65K binary data on a WebSocket - ArrayBuffer - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send 65K binary data on a WebSocket - ArrayBuffer - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send 65K binary data on a WebSocket - ArrayBuffer - Connection should be closed"); - - var data = ""; - var datasize = 65000; - var wsocket = CreateWebSocket(false, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.binaryType = "arraybuffer"; - data = new ArrayBuffer(datasize); - wsocket.send(data); - assert_equals(datasize, wsocket.bufferedAmount); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - assert_equals(evt.data.byteLength, datasize); - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send 65K binary data - ArrayBuffer - WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send 65K binary data on a WebSocket - ArrayBuffer - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send 65K binary data on a WebSocket - ArrayBuffer - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send 65K binary data on a WebSocket - ArrayBuffer - Connection should be closed"); + + var data = ""; + var datasize = 65000; + var wsocket = CreateWebSocket(false, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.binaryType = "arraybuffer"; + data = new ArrayBuffer(datasize); + wsocket.send(data); + assert_equals(datasize, wsocket.bufferedAmount); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + assert_equals(evt.data.byteLength, datasize); + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/Send-binary-arraybuffer.htm b/websockets/Send-binary-arraybuffer.htm index 5ea4da9..aeb4a38 100644 --- a/websockets/Send-binary-arraybuffer.htm +++ b/websockets/Send-binary-arraybuffer.htm
@@ -1,44 +1,44 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send binary data - ArrayBuffer - WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBuffer - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBuffer - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBuffer - Connection should be closed"); - - var data = ""; - var datasize = 15; - var wsocket = CreateWebSocket(false, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.binaryType = "arraybuffer"; - data = new ArrayBuffer(datasize); - wsocket.send(data); - assert_equals(datasize, wsocket.bufferedAmount); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - assert_equals(evt.data.byteLength, datasize); - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send binary data - ArrayBuffer - WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBuffer - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBuffer - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBuffer - Connection should be closed"); + + var data = ""; + var datasize = 15; + var wsocket = CreateWebSocket(false, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.binaryType = "arraybuffer"; + data = new ArrayBuffer(datasize); + wsocket.send(data); + assert_equals(datasize, wsocket.bufferedAmount); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + assert_equals(evt.data.byteLength, datasize); + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/Send-binary-arraybufferview-int16-offset.htm b/websockets/Send-binary-arraybufferview-int16-offset.htm index 2ce21ba..8df796b 100644 --- a/websockets/Send-binary-arraybufferview-int16-offset.htm +++ b/websockets/Send-binary-arraybufferview-int16-offset.htm
@@ -1,51 +1,51 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send binary data - ArrayBufferView - Int16Array with offset - WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int16Array with offset - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int16Array with offset - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int16Array with offset - Connection should be closed"); - - var data = ""; - var datasize = 8; - var view; - var wsocket = CreateWebSocket(false, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.binaryType = "arraybuffer"; - data = new ArrayBuffer(datasize); - view = new Int16Array(data, 2); - for(var i = 0; i < 4; i++) { - view[i] = i; - } - wsocket.send(view); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - var resultView = new Int16Array(evt.data); - for(var i = 0; i < resultView.length; i++) { - assert_equals(resultView[i], view[i], "ArrayBufferView returned is the same"); - } - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send binary data - ArrayBufferView - Int16Array with offset - WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int16Array with offset - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int16Array with offset - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int16Array with offset - Connection should be closed"); + + var data = ""; + var datasize = 8; + var view; + var wsocket = CreateWebSocket(false, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.binaryType = "arraybuffer"; + data = new ArrayBuffer(datasize); + view = new Int16Array(data, 2); + for(var i = 0; i < 4; i++) { + view[i] = i; + } + wsocket.send(view); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + var resultView = new Int16Array(evt.data); + for(var i = 0; i < resultView.length; i++) { + assert_equals(resultView[i], view[i], "ArrayBufferView returned is the same"); + } + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/Send-binary-arraybufferview-int8.htm b/websockets/Send-binary-arraybufferview-int8.htm index 2a29720..7a672c6 100644 --- a/websockets/Send-binary-arraybufferview-int8.htm +++ b/websockets/Send-binary-arraybufferview-int8.htm
@@ -1,51 +1,51 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send binary data - ArrayBufferView - Int8Array - WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int8Array - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int8Array - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int8Array - Connection should be closed"); - - var data = ""; - var datasize = 8; - var int8View; - var wsocket = CreateWebSocket(false, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.binaryType = "arraybuffer"; - data = new ArrayBuffer(datasize); - int8View = new Int8Array(data); - for(var i = 0; i < 8; i++) { - int8View[i] = i; - } - wsocket.send(int8View); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - var resultView = new Int8Array(evt.data); - for(var i = 0; i < resultView.length; i++) { - assert_equals(resultView[i], int8View[i], "ArrayBufferView returned is the same"); - } - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send binary data - ArrayBufferView - Int8Array - WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int8Array - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int8Array - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int8Array - Connection should be closed"); + + var data = ""; + var datasize = 8; + var int8View; + var wsocket = CreateWebSocket(false, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.binaryType = "arraybuffer"; + data = new ArrayBuffer(datasize); + int8View = new Int8Array(data); + for(var i = 0; i < 8; i++) { + int8View[i] = i; + } + wsocket.send(int8View); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + var resultView = new Int8Array(evt.data); + for(var i = 0; i < resultView.length; i++) { + assert_equals(resultView[i], int8View[i], "ArrayBufferView returned is the same"); + } + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/Send-binary-blob.htm b/websockets/Send-binary-blob.htm index f3c7df8..22238ba 100644 --- a/websockets/Send-binary-blob.htm +++ b/websockets/Send-binary-blob.htm
@@ -1,46 +1,46 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send binary data - Blob - WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - Blob - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - Blob - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - Blob - Connection should be closed"); - - var data = ""; - var datasize = 65000; - var isOpenCalled = false; - - var wsocket = CreateWebSocket(false, false, false); - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.binaryType = "blob"; - data = new ArrayBuffer(datasize); - isOpenCalled = true; - wsocket.send(data); - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - assert_true(evt.data instanceof Blob); - assert_equals(evt.data.size, datasize); - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_true(evt.wasClean, "wasClean should be true"); - testClose.done(); - }), true); - - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send binary data - Blob - WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - Blob - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - Blob - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - Blob - Connection should be closed"); + + var data = ""; + var datasize = 65000; + var isOpenCalled = false; + + var wsocket = CreateWebSocket(false, false, false); + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.binaryType = "blob"; + data = new ArrayBuffer(datasize); + isOpenCalled = true; + wsocket.send(data); + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + assert_true(evt.data instanceof Blob); + assert_equals(evt.data.size, datasize); + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_true(evt.wasClean, "wasClean should be true"); + testClose.done(); + }), true); + + </script> +</body> +</html> diff --git a/websockets/Send-data.htm b/websockets/Send-data.htm index 0e93188..cb58a30 100644 --- a/websockets/Send-data.htm +++ b/websockets/Send-data.htm
@@ -1,41 +1,41 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send data - WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send data on a WebSocket - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send data on a WebSocket - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send data on a WebSocket - Connection should be closed"); - - var data = "Message to send"; - var wsocket = CreateWebSocket(false, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.send(data); - assert_equals(data.length, wsocket.bufferedAmount); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - assert_equals(evt.data, data); - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send data - WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send data on a WebSocket - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send data on a WebSocket - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send data on a WebSocket - Connection should be closed"); + + var data = "Message to send"; + var wsocket = CreateWebSocket(false, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.send(data); + assert_equals(data.length, wsocket.bufferedAmount); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + assert_equals(evt.data, data); + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/Send-null.htm b/websockets/Send-null.htm index 4f7233f..b59e4a3 100644 --- a/websockets/Send-null.htm +++ b/websockets/Send-null.htm
@@ -1,43 +1,43 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send null data - WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send null data on a WebSocket - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send null data on a WebSocket - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send null data on a WebSocket - Connection should be closed"); - - var data = null; - var nullReturned = false; - var wsocket = CreateWebSocket(false, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.send(data); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - if ("null" == evt.data || "" == evt.data) - nullReturned = true; - assert_true(nullReturned); - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send null data - WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send null data on a WebSocket - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send null data on a WebSocket - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send null data on a WebSocket - Connection should be closed"); + + var data = null; + var nullReturned = false; + var wsocket = CreateWebSocket(false, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.send(data); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + if ("null" == evt.data || "" == evt.data) + nullReturned = true; + assert_true(nullReturned); + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/Send-paired-surrogates.htm b/websockets/Send-paired-surrogates.htm index db80ce4..055cfd2 100644 --- a/websockets/Send-paired-surrogates.htm +++ b/websockets/Send-paired-surrogates.htm
@@ -1,41 +1,41 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send (paired surrogates) data - WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send (paired surrogates) data on a WebSocket - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send (paired surrogates) data on a WebSocket - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send (paired surrogates) data on a WebSocket - Connection should be closed"); - - var data = "\uD801\uDC07"; - var wsocket = CreateWebSocket(false, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.send(data); - assert_equals(data.length * 2, wsocket.bufferedAmount); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - assert_equals(evt.data, data); - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send (paired surrogates) data - WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send (paired surrogates) data on a WebSocket - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send (paired surrogates) data on a WebSocket - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send (paired surrogates) data on a WebSocket - Connection should be closed"); + + var data = "\uD801\uDC07"; + var wsocket = CreateWebSocket(false, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.send(data); + assert_equals(data.length * 2, wsocket.bufferedAmount); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + assert_equals(evt.data, data); + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/Send-unicode-data.htm b/websockets/Send-unicode-data.htm index cb36804..77ec1b6 100644 --- a/websockets/Send-unicode-data.htm +++ b/websockets/Send-unicode-data.htm
@@ -1,41 +1,41 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Send unicode data - WebSocket</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js?pipe=sub"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Send unicode data on a WebSocket - Connection should be opened"); - var testMessage = async_test("W3C WebSocket API - Send unicode data on a WebSocket - Message should be received"); - var testClose = async_test("W3C WebSocket API - Send unicode data on a WebSocket - Connection should be closed"); - - var data = "¥¥¥¥¥¥"; - var wsocket = CreateWebSocket(false, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - wsocket.send(data); - assert_equals(data.length * 2, wsocket.bufferedAmount); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('message', testMessage.step_func(function (evt) { - assert_equals(evt.data, data); - wsocket.close(); - testMessage.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be open"); - assert_equals(evt.wasClean, true, "wasClean should be true"); - testClose.done(); - }), true); - </script> -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Send unicode data - WebSocket</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js?pipe=sub"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Send unicode data on a WebSocket - Connection should be opened"); + var testMessage = async_test("W3C WebSocket API - Send unicode data on a WebSocket - Message should be received"); + var testClose = async_test("W3C WebSocket API - Send unicode data on a WebSocket - Connection should be closed"); + + var data = "¥¥¥¥¥¥"; + var wsocket = CreateWebSocket(false, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + wsocket.send(data); + assert_equals(data.length * 2, wsocket.bufferedAmount); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('message', testMessage.step_func(function (evt) { + assert_equals(evt.data, data); + wsocket.close(); + testMessage.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be open"); + assert_equals(evt.wasClean, true, "wasClean should be true"); + testClose.done(); + }), true); + </script> +</body> +</html> diff --git a/websockets/binary/001.html b/websockets/binary/001.html index 7713bc3..5e56564 100644 --- a/websockets/binary/001.html +++ b/websockets/binary/001.html
@@ -1,24 +1,24 @@ -<!doctype html> -<title>WebSockets: Send/Receive blob, blob size less than network array buffer</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t){ - var ws = new WebSocket(SCHEME_DOMAIN_PORT + '/echo'); - var data = ""; - var datasize = 10; - ws.onopen = t.step_func(function(e) { - ws.binaryType = "blob"; - data = new ArrayBuffer(datasize); - ws.send(data); - }) - ws.onmessage = t.step_func(function(e) { - assert_true(e.data instanceof Blob); - assert_equals(e.data.size, datasize); - t.done(); - }) - -}); -</script> +<!doctype html> +<title>WebSockets: Send/Receive blob, blob size less than network array buffer</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t){ + var ws = new WebSocket(SCHEME_DOMAIN_PORT + '/echo'); + var data = ""; + var datasize = 10; + ws.onopen = t.step_func(function(e) { + ws.binaryType = "blob"; + data = new ArrayBuffer(datasize); + ws.send(data); + }) + ws.onmessage = t.step_func(function(e) { + assert_true(e.data instanceof Blob); + assert_equals(e.data.size, datasize); + t.done(); + }) + +}); +</script> diff --git a/websockets/binary/002.html b/websockets/binary/002.html index ae04ff7..b0b8e52 100644 --- a/websockets/binary/002.html +++ b/websockets/binary/002.html
@@ -1,25 +1,25 @@ -<!doctype html> -<title>WebSockets: Send/Receive blob, blob size greater than network array buffer</title> -<meta name=timeout content=long> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t){ - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); - var data = ""; - var datasize = 100000; - ws.onopen = t.step_func(function(e) { - ws.binaryType = "blob"; - data = new ArrayBuffer(datasize); - ws.send(data); - }); - ws.onmessage = t.step_func(function(e) { - assert_true(e.data instanceof Blob); - assert_equals(e.data.size, datasize); - t.done(); - }); - -}, null, {timeout:20000}); -</script> +<!doctype html> +<title>WebSockets: Send/Receive blob, blob size greater than network array buffer</title> +<meta name=timeout content=long> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t){ + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); + var data = ""; + var datasize = 100000; + ws.onopen = t.step_func(function(e) { + ws.binaryType = "blob"; + data = new ArrayBuffer(datasize); + ws.send(data); + }); + ws.onmessage = t.step_func(function(e) { + assert_true(e.data instanceof Blob); + assert_equals(e.data.size, datasize); + t.done(); + }); + +}, null, {timeout:20000}); +</script> diff --git a/websockets/binary/004.html b/websockets/binary/004.html index 566b63f..60f1a23 100644 --- a/websockets/binary/004.html +++ b/websockets/binary/004.html
@@ -1,24 +1,24 @@ -<!doctype html> -<title>WebSockets: Send/Receive ArrayBuffer, size greater than network array buffer</title> -<meta name=timeout content=long> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t){ - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); - var data = ""; - var datasize = 100000; - ws.onopen = t.step_func(function(e) { - ws.binaryType = "arraybuffer"; - data = new ArrayBuffer(datasize); - ws.send(data); - }) - ws.onmessage = t.step_func(function(e) { - assert_equals(e.data.byteLength, datasize); - t.done(); - }) - -}, null, {timeout:20000}); -</script> +<!doctype html> +<title>WebSockets: Send/Receive ArrayBuffer, size greater than network array buffer</title> +<meta name=timeout content=long> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t){ + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); + var data = ""; + var datasize = 100000; + ws.onopen = t.step_func(function(e) { + ws.binaryType = "arraybuffer"; + data = new ArrayBuffer(datasize); + ws.send(data); + }) + ws.onmessage = t.step_func(function(e) { + assert_equals(e.data.byteLength, datasize); + t.done(); + }) + +}, null, {timeout:20000}); +</script> diff --git a/websockets/binary/005.html b/websockets/binary/005.html index af36832..6f5597a 100644 --- a/websockets/binary/005.html +++ b/websockets/binary/005.html
@@ -1,22 +1,22 @@ -<!doctype html> -<title>WebSockets: Send/Receive ArrayBuffer, size less than network array buffer</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t){ - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); - var data = ""; - var datasize = 10; - ws.onopen = t.step_func(function(e) { - ws.binaryType = "arraybuffer"; - data = new ArrayBuffer(datasize); - ws.send(data); - }); - ws.onmessage = t.step_func(function(e) { - assert_equals(e.data.byteLength, datasize); - t.done(); - }); - }); -</script> +<!doctype html> +<title>WebSockets: Send/Receive ArrayBuffer, size less than network array buffer</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t){ + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); + var data = ""; + var datasize = 10; + ws.onopen = t.step_func(function(e) { + ws.binaryType = "arraybuffer"; + data = new ArrayBuffer(datasize); + ws.send(data); + }); + ws.onmessage = t.step_func(function(e) { + assert_equals(e.data.byteLength, datasize); + t.done(); + }); + }); +</script> diff --git a/websockets/binaryType-wrong-value.htm b/websockets/binaryType-wrong-value.htm index 1396dd7..9041fd6 100644 --- a/websockets/binaryType-wrong-value.htm +++ b/websockets/binaryType-wrong-value.htm
@@ -1,38 +1,38 @@ -<!DOCTYPE html> -<html> -<head> - <title>W3C WebSocket API - Create Secure WebSocket - binaryType is set to something other than blob/arraybuffer</title> - <script type="text/javascript" src="/resources/testharness.js"></script> - <script type="text/javascript" src="/resources/testharnessreport.js"></script> - <script type="text/javascript" src="websocket.js"></script> -</head> -<body> - <div id="log"></div> - <script type="text/javascript"> - - var testOpen = async_test("W3C WebSocket API - Create WebSocket - set binaryType to something other than blob or arraybuffer - SYNTAX_ERR is returned - Connection should be opened"); - var testClose = async_test("W3C WebSocket API - Create WebSocket - set binaryType to something other than blob or arraybuffer - SYNTAX_ERR is returned - Connection should be closed"); - - var wsocket = CreateWebSocket(true, false, false); - var isOpenCalled = false; - - wsocket.addEventListener('open', testOpen.step_func(function (evt) { - assert_equals(wsocket.binaryType, "blob"); - wsocket.binaryType = "notBlobOrArrayBuffer"; - assert_equals(wsocket.binaryType, "blob"); - wsocket.close(); - isOpenCalled = true; - testOpen.done(); - }), true); - - wsocket.addEventListener('close', testClose.step_func(function (evt) { - assert_true(isOpenCalled, "WebSocket connection should be opened"); - assert_true(evt.wasClean, "wasClean should be true"); - clearTimeout(timeOut); - testClose.done(); - }), true); - - </script> - -</body> -</html> +<!DOCTYPE html> +<html> +<head> + <title>W3C WebSocket API - Create Secure WebSocket - binaryType is set to something other than blob/arraybuffer</title> + <script type="text/javascript" src="/resources/testharness.js"></script> + <script type="text/javascript" src="/resources/testharnessreport.js"></script> + <script type="text/javascript" src="websocket.js"></script> +</head> +<body> + <div id="log"></div> + <script type="text/javascript"> + + var testOpen = async_test("W3C WebSocket API - Create WebSocket - set binaryType to something other than blob or arraybuffer - SYNTAX_ERR is returned - Connection should be opened"); + var testClose = async_test("W3C WebSocket API - Create WebSocket - set binaryType to something other than blob or arraybuffer - SYNTAX_ERR is returned - Connection should be closed"); + + var wsocket = CreateWebSocket(true, false, false); + var isOpenCalled = false; + + wsocket.addEventListener('open', testOpen.step_func(function (evt) { + assert_equals(wsocket.binaryType, "blob"); + wsocket.binaryType = "notBlobOrArrayBuffer"; + assert_equals(wsocket.binaryType, "blob"); + wsocket.close(); + isOpenCalled = true; + testOpen.done(); + }), true); + + wsocket.addEventListener('close', testClose.step_func(function (evt) { + assert_true(isOpenCalled, "WebSocket connection should be opened"); + assert_true(evt.wasClean, "wasClean should be true"); + clearTimeout(timeOut); + testClose.done(); + }), true); + + </script> + +</body> +</html> diff --git a/websockets/closing-handshake/002.html b/websockets/closing-handshake/002.html index ec1dee7..38d3a00 100644 --- a/websockets/closing-handshake/002.html +++ b/websockets/closing-handshake/002.html
@@ -1,21 +1,21 @@ -<!doctype html> -<title>WebSockets: server sends closing handshake</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t){ - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo_exit'); - ws.onmessage = ws.onerror = t.step_func(function() {assert_unreached()}); - ws.onopen = t.step_func(function(e) { - ws.send('Goodbye'); - }) - ws.onclose = function(e) { - assert_equals(e.wasClean, true, 'e.wasClean'); - ws.onclose = t.step_func(function() {assert_unreached()}); - - setTimeout(t.step_func(function() {t.done();}), 50) - } -}); -</script> +<!doctype html> +<title>WebSockets: server sends closing handshake</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t){ + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo_exit'); + ws.onmessage = ws.onerror = t.step_func(function() {assert_unreached()}); + ws.onopen = t.step_func(function(e) { + ws.send('Goodbye'); + }) + ws.onclose = function(e) { + assert_equals(e.wasClean, true, 'e.wasClean'); + ws.onclose = t.step_func(function() {assert_unreached()}); + + setTimeout(t.step_func(function() {t.done();}), 50) + } +}); +</script> diff --git a/websockets/closing-handshake/003.html b/websockets/closing-handshake/003.html index 88fbdd4..b0d7186 100644 --- a/websockets/closing-handshake/003.html +++ b/websockets/closing-handshake/003.html
@@ -1,20 +1,20 @@ -<!doctype html> -<title>WebSockets: client sends closing handshake</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT + '/echo'); - ws.onmessage = ws.onerror = t.step_func(function() {assert_unreached()}); - ws.onopen = function(e) { - ws.close(); - } - ws.onclose = function(e) { - assert_equals(e.wasClean, true, 'e.wasClean'); - ws.onclose = t.step_func(function() {assert_unreached()}); - setTimeout(t.step_func(function() {t.done()}), 50); - } -}); -</script> +<!doctype html> +<title>WebSockets: client sends closing handshake</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT + '/echo'); + ws.onmessage = ws.onerror = t.step_func(function() {assert_unreached()}); + ws.onopen = function(e) { + ws.close(); + } + ws.onclose = function(e) { + assert_equals(e.wasClean, true, 'e.wasClean'); + ws.onclose = t.step_func(function() {assert_unreached()}); + setTimeout(t.step_func(function() {t.done()}), 50); + } +}); +</script> diff --git a/websockets/closing-handshake/004.html b/websockets/closing-handshake/004.html index 47a326d..03da57d 100644 --- a/websockets/closing-handshake/004.html +++ b/websockets/closing-handshake/004.html
@@ -1,22 +1,22 @@ -<!doctype html> -<title>WebSockets: data after closing handshake</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo_close_data'); - ws.onmessage = ws.onerror = t.step_func(function() {assert_unreached()}); - - ws.onopen = t.step_func(function(e) { - ws.send('Goodbye'); - }) - - ws.onclose = t.step_func(function(e) { - assert_equals(e.wasClean, true); - ws.onclose = t.step_func(function() {assert_unreached()}); - setTimeout(t.step_func(function() {t.done()}), 50); - }) -}); -</script> +<!doctype html> +<title>WebSockets: data after closing handshake</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo_close_data'); + ws.onmessage = ws.onerror = t.step_func(function() {assert_unreached()}); + + ws.onopen = t.step_func(function(e) { + ws.send('Goodbye'); + }) + + ws.onclose = t.step_func(function(e) { + assert_equals(e.wasClean, true); + ws.onclose = t.step_func(function() {assert_unreached()}); + setTimeout(t.step_func(function() {t.done()}), 50); + }) +}); +</script> diff --git a/websockets/constructor/001.html b/websockets/constructor/001.html index e35c264..64abe3e 100644 --- a/websockets/constructor/001.html +++ b/websockets/constructor/001.html
@@ -1,11 +1,11 @@ -<!doctype html> -<title>WebSockets: new WebSocket() with no args</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function() { - assert_throws(new TypeError(), function(){new WebSocket()}); -}); -</script> +<!doctype html> +<title>WebSockets: new WebSocket() with no args</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function() { + assert_throws(new TypeError(), function(){new WebSocket()}); +}); +</script> diff --git a/websockets/constructor/002.html b/websockets/constructor/002.html index 5103b10..fd12d24 100644 --- a/websockets/constructor/002.html +++ b/websockets/constructor/002.html
@@ -1,18 +1,18 @@ -<!doctype html> -<title>WebSockets: new WebSocket(invalid url)</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function() {assert_throws("SyntaxError", function(){new WebSocket("/test")})}); -test(function() {assert_throws("SyntaxError", function(){new WebSocket("ws://foo bar.com/")})}); -test(function() {assert_throws("SyntaxError", function(){new WebSocket("wss://foo bar.com/")})}); -test(function() {assert_throws("SyntaxError", function(){new WebSocket("http://"+location.hostname+"/")})}); -test(function() {assert_throws("SyntaxError", function(){new WebSocket("mailto:example@example.org")})}); -test(function() {assert_throws("SyntaxError", function(){new WebSocket("about:blank")})}); -test(function() {assert_throws("SyntaxError", function(){new WebSocket("ws://"+location.hostname+"/#")})}); -test(function() {assert_throws("SyntaxError", function(){new WebSocket("ws://"+location.hostname+"/#test")})}); -test(function() {assert_throws("SyntaxError", function(){new WebSocket("?test")})}); -test(function() {assert_throws("SyntaxError", function(){new WebSocket("#test")})}); -</script> +<!doctype html> +<title>WebSockets: new WebSocket(invalid url)</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function() {assert_throws("SyntaxError", function(){new WebSocket("/test")})}); +test(function() {assert_throws("SyntaxError", function(){new WebSocket("ws://foo bar.com/")})}); +test(function() {assert_throws("SyntaxError", function(){new WebSocket("wss://foo bar.com/")})}); +test(function() {assert_throws("SyntaxError", function(){new WebSocket("http://"+location.hostname+"/")})}); +test(function() {assert_throws("SyntaxError", function(){new WebSocket("mailto:example@example.org")})}); +test(function() {assert_throws("SyntaxError", function(){new WebSocket("about:blank")})}); +test(function() {assert_throws("SyntaxError", function(){new WebSocket("ws://"+location.hostname+"/#")})}); +test(function() {assert_throws("SyntaxError", function(){new WebSocket("ws://"+location.hostname+"/#test")})}); +test(function() {assert_throws("SyntaxError", function(){new WebSocket("?test")})}); +test(function() {assert_throws("SyntaxError", function(){new WebSocket("#test")})}); +</script> diff --git a/websockets/constructor/004.html b/websockets/constructor/004.html index dc93235..9c37206 100644 --- a/websockets/constructor/004.html +++ b/websockets/constructor/004.html
@@ -1,23 +1,23 @@ -<!doctype html> -<title>WebSockets: new WebSocket(url, invalid protocol)</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -// empty string -test(function() {assert_throws("SyntaxError", function(){new WebSocket("ws://"+location.hostname+"/", "")})}); - -// chars below U+0020 except U+0000; U+0000 is tested in a separate test -for (var i = 1; i < 0x20; ++i) { -test(function() { - assert_throws("SyntaxError", function(){new WebSocket("ws://"+location.hostname+"/", "a"+String.fromCharCode(i)+"b")}, 'char code '+i); -}) -} -// some chars above U+007E -for (var i = 0x7F; i < 0x100; ++i) { -test(function() { - assert_throws("SyntaxError", function(){new WebSocket("ws://"+location.hostname+"/", "a"+String.fromCharCode(i)+"b")}, 'char code '+i); -}) -} -</script> +<!doctype html> +<title>WebSockets: new WebSocket(url, invalid protocol)</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +// empty string +test(function() {assert_throws("SyntaxError", function(){new WebSocket("ws://"+location.hostname+"/", "")})}); + +// chars below U+0020 except U+0000; U+0000 is tested in a separate test +for (var i = 1; i < 0x20; ++i) { +test(function() { + assert_throws("SyntaxError", function(){new WebSocket("ws://"+location.hostname+"/", "a"+String.fromCharCode(i)+"b")}, 'char code '+i); +}) +} +// some chars above U+007E +for (var i = 0x7F; i < 0x100; ++i) { +test(function() { + assert_throws("SyntaxError", function(){new WebSocket("ws://"+location.hostname+"/", "a"+String.fromCharCode(i)+"b")}, 'char code '+i); +}) +} +</script> diff --git a/websockets/constructor/005.html b/websockets/constructor/005.html index 75cb11c..0604453 100644 --- a/websockets/constructor/005.html +++ b/websockets/constructor/005.html
@@ -1,11 +1,11 @@ -<!doctype html> -<title>WebSockets: return value</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function() { - assert_true(new WebSocket("ws://"+location.hostname+"/") instanceof WebSocket); -}); -</script> +<!doctype html> +<title>WebSockets: return value</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function() { + assert_true(new WebSocket("ws://"+location.hostname+"/") instanceof WebSocket); +}); +</script> diff --git a/websockets/constructor/006.html b/websockets/constructor/006.html index 1b07353..83e7709 100644 --- a/websockets/constructor/006.html +++ b/websockets/constructor/006.html
@@ -1,26 +1,26 @@ -<!doctype html> -<title>WebSockets: converting first arguments</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var a = document.createElement('a'); - a.href = SCHEME_DOMAIN_PORT+'/echo'; - var ws = new WebSocket(a); // should stringify arguments; <a> stringifies to its .href - assert_equals(ws.url, a.href); - ws.onopen = t.step_func(function(e) { - ws.send('test'); - }); - ws.onmessage = t.step_func(function(e) { - assert_equals(e.data, 'test'); - ws.onclose = t.step_func(function(e) { - ws.onclose = t.step_func(function() {assert_unreached()}); - setTimeout(t.step_func(function() {t.done()}), 50); - }); - ws.close(); - }); - ws.onerror = ws.onclose = t.step_func(function() {assert_unreached()}); -}); -</script> +<!doctype html> +<title>WebSockets: converting first arguments</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var a = document.createElement('a'); + a.href = SCHEME_DOMAIN_PORT+'/echo'; + var ws = new WebSocket(a); // should stringify arguments; <a> stringifies to its .href + assert_equals(ws.url, a.href); + ws.onopen = t.step_func(function(e) { + ws.send('test'); + }); + ws.onmessage = t.step_func(function(e) { + assert_equals(e.data, 'test'); + ws.onclose = t.step_func(function(e) { + ws.onclose = t.step_func(function() {assert_unreached()}); + setTimeout(t.step_func(function() {t.done()}), 50); + }); + ws.close(); + }); + ws.onerror = ws.onclose = t.step_func(function() {assert_unreached()}); +}); +</script> diff --git a/websockets/constructor/007.html b/websockets/constructor/007.html index bd3cdd6..f070cd8 100644 --- a/websockets/constructor/007.html +++ b/websockets/constructor/007.html
@@ -1,9 +1,9 @@ -<!doctype html> -<title>WebSockets: new WebSocket(url, null char)</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function() {assert_throws("SyntaxError", function(){new WebSocket("ws://"+location.hostname+"/", 'a'+String.fromCharCode(0)+'b')})}); -</script> +<!doctype html> +<title>WebSockets: new WebSocket(url, null char)</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function() {assert_throws("SyntaxError", function(){new WebSocket("ws://"+location.hostname+"/", 'a'+String.fromCharCode(0)+'b')})}); +</script> diff --git a/websockets/constructor/008.html b/websockets/constructor/008.html index 1635580..2ed97ee 100644 --- a/websockets/constructor/008.html +++ b/websockets/constructor/008.html
@@ -1,13 +1,13 @@ -<!doctype html> -<title>WebSockets: new WebSocket(url with not blocked port)</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -//Pass condition is to not throw -test(function(){new WebSocket('ws://example.invalid:80/')}); -test(function(){new WebSocket('ws://example.invalid:443/')}); -test(function(){new WebSocket('wss://example.invalid:80/')}); -test(function(){new WebSocket('wss://example.invalid:443/')}); -</script> +<!doctype html> +<title>WebSockets: new WebSocket(url with not blocked port)</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +//Pass condition is to not throw +test(function(){new WebSocket('ws://example.invalid:80/')}); +test(function(){new WebSocket('ws://example.invalid:443/')}); +test(function(){new WebSocket('wss://example.invalid:80/')}); +test(function(){new WebSocket('wss://example.invalid:443/')}); +</script> diff --git a/websockets/constructor/009.html b/websockets/constructor/009.html index 0fdf1c7..b0fb80d 100644 --- a/websockets/constructor/009.html +++ b/websockets/constructor/009.html
@@ -1,21 +1,21 @@ -<!doctype html> -<title>WebSockets: protocol</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/protocol', 'foobar'); - - ws.onmessage = t.step_func(function(e) { - assert_equals(ws.protocol, 'foobar'); - ws.onclose = t.step_func(function(e) { - ws.onclose = t.step_func(function() {assert_unreached()}); - setTimeout(t.step_func(function() {t.done()}), 50); - }) - ws.close(); - }) - ws.onerror = t.step_func(function() {assert_unreached()}); -}); -</script> +<!doctype html> +<title>WebSockets: protocol</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/protocol', 'foobar'); + + ws.onmessage = t.step_func(function(e) { + assert_equals(ws.protocol, 'foobar'); + ws.onclose = t.step_func(function(e) { + ws.onclose = t.step_func(function() {assert_unreached()}); + setTimeout(t.step_func(function() {t.done()}), 50); + }) + ws.close(); + }) + ws.onerror = t.step_func(function() {assert_unreached()}); +}); +</script> diff --git a/websockets/constructor/010.html b/websockets/constructor/010.html index b11abac..4abb417 100644 --- a/websockets/constructor/010.html +++ b/websockets/constructor/010.html
@@ -1,20 +1,20 @@ -<!doctype html> -<title>WebSockets: protocol in response but no requested protocol</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/handshake_protocol'); - ws.onerror = ws.onmessage = ws.onclose = t.step_func(function(e) {assert_unreached(e.type)}); - ws.onopen = t.step_func(function(e) { - ws.onclose = t.step_func(function(e) { - ws.onclose = t.step_func(function(e) {assert_unreached(e.type)}); - setTimeout(t.step_func(function() {t.done();}), 50); - }) - ws.close(); - }) -}); -</script> - +<!doctype html> +<title>WebSockets: protocol in response but no requested protocol</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/handshake_protocol'); + ws.onerror = ws.onmessage = ws.onclose = t.step_func(function(e) {assert_unreached(e.type)}); + ws.onopen = t.step_func(function(e) { + ws.onclose = t.step_func(function(e) { + ws.onclose = t.step_func(function(e) {assert_unreached(e.type)}); + setTimeout(t.step_func(function() {t.done();}), 50); + }) + ws.close(); + }) +}); +</script> + diff --git a/websockets/constructor/011.html b/websockets/constructor/011.html index 157f96e..0efe022 100644 --- a/websockets/constructor/011.html +++ b/websockets/constructor/011.html
@@ -1,25 +1,25 @@ -<!doctype html> -<title>WebSockets: protocol mismatch</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/handshake_protocol', 'FOOBAR'); - var gotOpen = false; - var gotError = false; - ws.onopen = t.step_func(function(e) { - gotOpen = true; - }) - ws.onerror = t.step_func(function(e) { - gotError = true; - }) - ws.onclose = t.step_func(function(e) { - assert_true(gotOpen, 'got open'); - assert_true(gotError, 'got error'); - ws.onclose = t.step_func(function() {assert_unreached()}); - setTimeout(t.step_func(function() {t.done();}), 50); - }) -}); -</script> +<!doctype html> +<title>WebSockets: protocol mismatch</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/handshake_protocol', 'FOOBAR'); + var gotOpen = false; + var gotError = false; + ws.onopen = t.step_func(function(e) { + gotOpen = true; + }) + ws.onerror = t.step_func(function(e) { + gotError = true; + }) + ws.onclose = t.step_func(function(e) { + assert_true(gotOpen, 'got open'); + assert_true(gotError, 'got error'); + ws.onclose = t.step_func(function() {assert_unreached()}); + setTimeout(t.step_func(function() {t.done();}), 50); + }) +}); +</script> diff --git a/websockets/constructor/012.html b/websockets/constructor/012.html index 448e227..66ca9ea 100644 --- a/websockets/constructor/012.html +++ b/websockets/constructor/012.html
@@ -1,17 +1,17 @@ -<!doctype html> -<title>WebSockets: no protocol in response</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/handshake_no_protocol', 'foobar'); - ws.onclose = t.step_func(function(e) { - ws.onclose = t.step_func(function() {assert_unreached()}); - setTimeout(t.step_func(function() {t.done();}), 50) - }) - ws.onmessage = t.step_func(function() {assert_unreached()}); -}); -</script> - +<!doctype html> +<title>WebSockets: no protocol in response</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/handshake_no_protocol', 'foobar'); + ws.onclose = t.step_func(function(e) { + ws.onclose = t.step_func(function() {assert_unreached()}); + setTimeout(t.step_func(function() {t.done();}), 50) + }) + ws.onmessage = t.step_func(function() {assert_unreached()}); +}); +</script> + diff --git a/websockets/constructor/013.html b/websockets/constructor/013.html index 986811c..137922d 100644 --- a/websockets/constructor/013.html +++ b/websockets/constructor/013.html
@@ -1,39 +1,39 @@ -<!doctype html> -<title>WebSockets: multiple WebSocket objects</title> -<meta name=timeout content=long> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - // test that the events are fired as they should when opening 25 websockets and - // sending a message on each and then closing when getting the message back - var ws = []; - var events = 0; - for (var i = 0; i < 25; ++i) { - ws[i] = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); - ws[i].id = i; - ws[i].onopen = t.step_func(function(e) { - events++; - this.send(this.id); - this.onopen = t.step_func(function() {assert_unreached()}); - }, ws[i]); - ws[i].onmessage = t.step_func(function(e) { - events++; - assert_equals(e.data, ''+this.id); - this.close(); - this.onmessage = t.step_func(function() {assert_unreached()}); - }, ws[i]); - ws[i].onclose = t.step_func(function(e) { - events++; - if (events == 75) { - t.done(); - } - this.onclose = t.step_func(function() {assert_unreached()}); - }, ws[i]); - ws[i].onerror = t.step_func(function() {assert_unreached()}); - } -}, null, {timeout:25000}); -</script> - +<!doctype html> +<title>WebSockets: multiple WebSocket objects</title> +<meta name=timeout content=long> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + // test that the events are fired as they should when opening 25 websockets and + // sending a message on each and then closing when getting the message back + var ws = []; + var events = 0; + for (var i = 0; i < 25; ++i) { + ws[i] = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); + ws[i].id = i; + ws[i].onopen = t.step_func(function(e) { + events++; + this.send(this.id); + this.onopen = t.step_func(function() {assert_unreached()}); + }, ws[i]); + ws[i].onmessage = t.step_func(function(e) { + events++; + assert_equals(e.data, ''+this.id); + this.close(); + this.onmessage = t.step_func(function() {assert_unreached()}); + }, ws[i]); + ws[i].onclose = t.step_func(function(e) { + events++; + if (events == 75) { + t.done(); + } + this.onclose = t.step_func(function() {assert_unreached()}); + }, ws[i]); + ws[i].onerror = t.step_func(function() {assert_unreached()}); + } +}, null, {timeout:25000}); +</script> + diff --git a/websockets/constructor/014.html b/websockets/constructor/014.html index e73f660..b7d1e83 100644 --- a/websockets/constructor/014.html +++ b/websockets/constructor/014.html
@@ -1,35 +1,35 @@ -<!doctype html> -<title>WebSockets: serialize establish a connection</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> - -async_test(function(t) { - var ws = []; - var events = 0; - var prevDate; - var date; - for (var i = 0; i < 4; ++i) { - ws[i] = new WebSocket(SCHEME_DOMAIN_PORT+'/handshake_sleep_1'); - ws[i].id = i; - ws[i].onopen = t.step_func(function(e) { - events++; - date = new Date(); - if (prevDate) - assert_greater_than(date-prevDate, 998); - prevDate = date; - this.onopen = t.step_func(function() {assert_unreached()}); - }) - ws[i].onclose = t.step_func(function(e) { - events++; - if (events == 8) { - t.done(); - } - this.onclose = t.step_func(function() {assert_unreached()}); - }); - ws[i].onerror = ws[i].onmessage = t.step_func(function() {assert_unreached()}); - } -}, null, {timeout:10000}); -</script> +<!doctype html> +<title>WebSockets: serialize establish a connection</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> + +async_test(function(t) { + var ws = []; + var events = 0; + var prevDate; + var date; + for (var i = 0; i < 4; ++i) { + ws[i] = new WebSocket(SCHEME_DOMAIN_PORT+'/handshake_sleep_1'); + ws[i].id = i; + ws[i].onopen = t.step_func(function(e) { + events++; + date = new Date(); + if (prevDate) + assert_greater_than(date-prevDate, 998); + prevDate = date; + this.onopen = t.step_func(function() {assert_unreached()}); + }) + ws[i].onclose = t.step_func(function(e) { + events++; + if (events == 8) { + t.done(); + } + this.onclose = t.step_func(function() {assert_unreached()}); + }); + ws[i].onerror = ws[i].onmessage = t.step_func(function() {assert_unreached()}); + } +}, null, {timeout:10000}); +</script> diff --git a/websockets/constructor/016.html b/websockets/constructor/016.html index 92dd2ee..938d591 100644 --- a/websockets/constructor/016.html +++ b/websockets/constructor/016.html
@@ -1,17 +1,17 @@ -<!doctype html> -<meta charset=windows-1252> -<title>WebSockets: non-ascii URL in query, document encoding windows-1252</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo-query_v13?åäö'); - ws.onclose = t.step_func(function() {assert_unreached()}); - ws.onmessage = t.step_func(function(e) { - assert_equals(e.data, '%C3%A5%C3%A4%C3%B6'); - t.done(); - }); -}); -</script> +<!doctype html> +<meta charset=windows-1252> +<title>WebSockets: non-ascii URL in query, document encoding windows-1252</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo-query_v13?åäö'); + ws.onclose = t.step_func(function() {assert_unreached()}); + ws.onmessage = t.step_func(function(e) { + assert_equals(e.data, '%C3%A5%C3%A4%C3%B6'); + t.done(); + }); +}); +</script> diff --git a/websockets/constructor/017.html b/websockets/constructor/017.html index ea28150..37b3c82 100644 --- a/websockets/constructor/017.html +++ b/websockets/constructor/017.html
@@ -1,13 +1,13 @@ -<!doctype html> -<title>WebSockets: too few slashes after ws: and wss:</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -var tests = ['ws:', 'ws:/', 'wss:', 'wss:/']; -//Pass condition is to not throw -for (var i = 0; i < tests.length; ++i) { - test(function(){new WebSocket(tests[i]+location.hostname+'/echo')}, tests[i]); -} -</script> +<!doctype html> +<title>WebSockets: too few slashes after ws: and wss:</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +var tests = ['ws:', 'ws:/', 'wss:', 'wss:/']; +//Pass condition is to not throw +for (var i = 0; i < tests.length; ++i) { + test(function(){new WebSocket(tests[i]+location.hostname+'/echo')}, tests[i]); +} +</script> diff --git a/websockets/constructor/018.html b/websockets/constructor/018.html index a4f40c1..c40e4f7 100644 --- a/websockets/constructor/018.html +++ b/websockets/constructor/018.html
@@ -1,17 +1,17 @@ -<!doctype html> -<title>WebSockets: NULL char in url</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo-query?x\u0000'); - ws.onmessage = t.step_func(function(e) { - assert_equals(e.data, 'x%00'); - ws.close(); - t.done(); - }) - ws.onclose = ws.onerror = t.step_func(function(e) {assert_unreached(e.type)}); -}); -</script> +<!doctype html> +<title>WebSockets: NULL char in url</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo-query?x\u0000'); + ws.onmessage = t.step_func(function(e) { + assert_equals(e.data, 'x%00'); + ws.close(); + t.done(); + }) + ws.onclose = ws.onerror = t.step_func(function(e) {assert_unreached(e.type)}); +}); +</script> diff --git a/websockets/constructor/019.html b/websockets/constructor/019.html index 4b6698d..9e5c792 100644 --- a/websockets/constructor/019.html +++ b/websockets/constructor/019.html
@@ -1,18 +1,18 @@ -<!doctype html> -<title>WebSockets: uppercase 'WS:'</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var scheme = SCHEME_DOMAIN_PORT.split('://')[0]; - var domain = SCHEME_DOMAIN_PORT.split('://')[1]; - var ws = new WebSocket(scheme.toUpperCase()+'://'+domain+'/echo'); - ws.onopen = t.step_func(function(e) { - ws.close(); - t.done(); - }) - ws.onclose = ws.onerror = ws.onmessage = t.step_func(function() {assert_unreached()}); -}); -</script> +<!doctype html> +<title>WebSockets: uppercase 'WS:'</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var scheme = SCHEME_DOMAIN_PORT.split('://')[0]; + var domain = SCHEME_DOMAIN_PORT.split('://')[1]; + var ws = new WebSocket(scheme.toUpperCase()+'://'+domain+'/echo'); + ws.onopen = t.step_func(function(e) { + ws.close(); + t.done(); + }) + ws.onclose = ws.onerror = ws.onmessage = t.step_func(function() {assert_unreached()}); +}); +</script> diff --git a/websockets/constructor/020.html b/websockets/constructor/020.html index f96e905..37aaf8d 100644 --- a/websockets/constructor/020.html +++ b/websockets/constructor/020.html
@@ -1,18 +1,18 @@ -<!doctype html> -<title>WebSockets: uppercase host</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var scheme = SCHEME_DOMAIN_PORT.split('://')[0]; - var domain = SCHEME_DOMAIN_PORT.split('://')[1]; - var ws = new WebSocket(scheme+'://'+domain.toUpperCase()+'/echo'); - ws.onopen = t.step_func(function(e) { - ws.close(); - t.done(); - }); - ws.onclose = ws.onerror = ws.onmessage = t.step_func(function() {assert_unreached()}); -}); -</script> +<!doctype html> +<title>WebSockets: uppercase host</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var scheme = SCHEME_DOMAIN_PORT.split('://')[0]; + var domain = SCHEME_DOMAIN_PORT.split('://')[1]; + var ws = new WebSocket(scheme+'://'+domain.toUpperCase()+'/echo'); + ws.onopen = t.step_func(function(e) { + ws.close(); + t.done(); + }); + ws.onclose = ws.onerror = ws.onmessage = t.step_func(function() {assert_unreached()}); +}); +</script> diff --git a/websockets/constructor/021.html b/websockets/constructor/021.html index 42bb78a..a313c77 100644 --- a/websockets/constructor/021.html +++ b/websockets/constructor/021.html
@@ -1,9 +1,9 @@ -<!doctype html> -<title>WebSockets: Same sub protocol twice</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function() {assert_throws("SyntaxError", function(){new WebSocket("ws://certo2.oslo.osa/protocol_array",["foobar, foobar"])})}); -</script> +<!doctype html> +<title>WebSockets: Same sub protocol twice</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function() {assert_throws("SyntaxError", function(){new WebSocket("ws://certo2.oslo.osa/protocol_array",["foobar, foobar"])})}); +</script> diff --git a/websockets/constructor/022.html b/websockets/constructor/022.html index 6c4603e..0e6c348 100644 --- a/websockets/constructor/022.html +++ b/websockets/constructor/022.html
@@ -1,20 +1,20 @@ -<!doctype html> -<title>WebSockets: protocol array</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/protocol_array',['foobar','foobar2']); - ws.onmessage = t.step_func(function(e) { - assert_equals(ws.protocol, 'foobar'); - ws.onclose = t.step_func(function(e) { - ws.onclose = t.step_func(function() {assert_unreached()}); - setTimeout(t.step_func(function() {t.done();}), 50) - }); - ws.close(); - }); - ws.onerror = t.step_func(function() {assert_unreached()}); -}); -</script> +<!doctype html> +<title>WebSockets: protocol array</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/protocol_array',['foobar','foobar2']); + ws.onmessage = t.step_func(function(e) { + assert_equals(ws.protocol, 'foobar'); + ws.onclose = t.step_func(function(e) { + ws.onclose = t.step_func(function() {assert_unreached()}); + setTimeout(t.step_func(function() {t.done();}), 50) + }); + ws.close(); + }); + ws.onerror = t.step_func(function() {assert_unreached()}); +}); +</script> diff --git a/websockets/cookies/001.html b/websockets/cookies/001.html index b128bae..b0701d0 100644 --- a/websockets/cookies/001.html +++ b/websockets/cookies/001.html
@@ -1,23 +1,23 @@ -<!doctype html> -<title>WebSockets: Cookie in request</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -var cookie_id = ((new Date())-0) + '.' + Math.random(); -async_test(function(t) { - if (window.WebSocket) { - document.cookie = 'ws_test_'+cookie_id+'=test; Path=/'; - } - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo-cookie'); - ws.onmessage = t.step_func(function(e) { - assert_regexp_match(e.data, new RegExp('ws_test_'+cookie_id+'=test')); - ws.close(); - t.done(); - }); - ws.onerror = ws.onclose = t.step_func(function(e) {assert_unreached(e.type)}); -}); -// remove cookie -document.cookie = 'ws_test_'+cookie_id+'=; Path=/; Expires=Sun, 06 Nov 1994 08:49:37 GMT'; -</script> +<!doctype html> +<title>WebSockets: Cookie in request</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +var cookie_id = ((new Date())-0) + '.' + Math.random(); +async_test(function(t) { + if (window.WebSocket) { + document.cookie = 'ws_test_'+cookie_id+'=test; Path=/'; + } + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo-cookie'); + ws.onmessage = t.step_func(function(e) { + assert_regexp_match(e.data, new RegExp('ws_test_'+cookie_id+'=test')); + ws.close(); + t.done(); + }); + ws.onerror = ws.onclose = t.step_func(function(e) {assert_unreached(e.type)}); +}); +// remove cookie +document.cookie = 'ws_test_'+cookie_id+'=; Path=/; Expires=Sun, 06 Nov 1994 08:49:37 GMT'; +</script> diff --git a/websockets/cookies/002.html b/websockets/cookies/002.html index 602bd63..1e6a1db 100644 --- a/websockets/cookies/002.html +++ b/websockets/cookies/002.html
@@ -1,20 +1,20 @@ -<!doctype html> -<title>WebSockets: Set-Cookie in response</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -var cookie_id = ((new Date())-0) + '.' + Math.random(); -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/set-cookie?'+cookie_id); - ws.onopen = t.step_func(function(e) { - assert_regexp_match(document.cookie, new RegExp('ws_test_'+cookie_id+'=test')); - // remove cookie - document.cookie = 'ws_test_'+cookie_id+'=; Path=/; Expires=Sun, 06 Nov 1994 08:49:37 GMT'; - ws.close(); - t.done(); - }); - ws.onerror = ws.onclose = t.step_func(function(e) {assert_unreached(e.type)}); -}); -</script> +<!doctype html> +<title>WebSockets: Set-Cookie in response</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +var cookie_id = ((new Date())-0) + '.' + Math.random(); +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/set-cookie?'+cookie_id); + ws.onopen = t.step_func(function(e) { + assert_regexp_match(document.cookie, new RegExp('ws_test_'+cookie_id+'=test')); + // remove cookie + document.cookie = 'ws_test_'+cookie_id+'=; Path=/; Expires=Sun, 06 Nov 1994 08:49:37 GMT'; + ws.close(); + t.done(); + }); + ws.onerror = ws.onclose = t.step_func(function(e) {assert_unreached(e.type)}); +}); +</script> diff --git a/websockets/cookies/003.html b/websockets/cookies/003.html index 87cfbab..e424d9f 100644 --- a/websockets/cookies/003.html +++ b/websockets/cookies/003.html
@@ -1,33 +1,33 @@ -<!doctype html> -<title>WebSockets: sending HttpOnly cookies in ws request</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -setup({explict_done:true}) -var cookie_id = ((new Date())-0) + '.' + Math.random(); - -var t = async_test(function(t) { -var iframe = document.createElement('iframe'); -iframe.src = 'support/set-cookie.py?'+encodeURIComponent('ws_test_'+cookie_id+'=test; Path=/; HttpOnly'); -iframe.onload = t.step_func(function() { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo-cookie'); - ws.onmessage = t.step_func(function(e) { - ws.close(); - assert_regexp_match(e.data, new RegExp('ws_test_'+cookie_id+'=test')); - t.done();; - }); - ws.onclose = function() { deleteCookie(false, e.type); } -}); - -var cookie_removed = false; - -add_result_callback(function() { - iframe.src = 'support/set-cookie.py?'+encodeURIComponent('ws_test_'+cookie_id+'=; Path=/; HttpOnly; Expires=Sun, 06 Nov 1994 08:49:37 GMT'); - iframe.onload = done; -}); - -document.body.appendChild(iframe); -}, null, {timeout:9900}); -</script> +<!doctype html> +<title>WebSockets: sending HttpOnly cookies in ws request</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +setup({explict_done:true}) +var cookie_id = ((new Date())-0) + '.' + Math.random(); + +var t = async_test(function(t) { +var iframe = document.createElement('iframe'); +iframe.src = 'support/set-cookie.py?'+encodeURIComponent('ws_test_'+cookie_id+'=test; Path=/; HttpOnly'); +iframe.onload = t.step_func(function() { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo-cookie'); + ws.onmessage = t.step_func(function(e) { + ws.close(); + assert_regexp_match(e.data, new RegExp('ws_test_'+cookie_id+'=test')); + t.done();; + }); + ws.onclose = function() { deleteCookie(false, e.type); } +}); + +var cookie_removed = false; + +add_result_callback(function() { + iframe.src = 'support/set-cookie.py?'+encodeURIComponent('ws_test_'+cookie_id+'=; Path=/; HttpOnly; Expires=Sun, 06 Nov 1994 08:49:37 GMT'); + iframe.onload = done; +}); + +document.body.appendChild(iframe); +}, null, {timeout:9900}); +</script> diff --git a/websockets/cookies/004.html b/websockets/cookies/004.html index 0a0871d..894ef2e 100644 --- a/websockets/cookies/004.html +++ b/websockets/cookies/004.html
@@ -1,29 +1,29 @@ -<!doctype html> -<title>WebSockets: setting HttpOnly cookies in ws response, checking document.cookie</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -setup({explicit_done:true}) -var cookie_id = ((new Date())-0) + '.' + Math.random(); - -var t = async_test(function(t) { - var iframe = document.createElement('iframe'); - var url = SCHEME_DOMAIN_PORT+'/set-cookie_http?'+cookie_id; - var ws = new WebSocket(url); - ws.onopen = t.step_func(function(e) { - ws.close(); - assert_false(new RegExp('ws_test_'+cookie_id+'=test').test(document.cookie)); - t.done(); - }); - ws.onclose = t.step_func(function(e) {assert_unreached()}); - - - add_result_callback(function() { - iframe.src = 'support/set-cookie.py?'+encodeURIComponent('ws_test_'+cookie_id+'=; Path=/; HttpOnly; Expires=Sun, 06 Nov 1994 08:49:37 GMT'); - iframe.onload = done; - }); - document.body.appendChild(iframe); -}, null, {timeout:9900}) -</script> +<!doctype html> +<title>WebSockets: setting HttpOnly cookies in ws response, checking document.cookie</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +setup({explicit_done:true}) +var cookie_id = ((new Date())-0) + '.' + Math.random(); + +var t = async_test(function(t) { + var iframe = document.createElement('iframe'); + var url = SCHEME_DOMAIN_PORT+'/set-cookie_http?'+cookie_id; + var ws = new WebSocket(url); + ws.onopen = t.step_func(function(e) { + ws.close(); + assert_false(new RegExp('ws_test_'+cookie_id+'=test').test(document.cookie)); + t.done(); + }); + ws.onclose = t.step_func(function(e) {assert_unreached()}); + + + add_result_callback(function() { + iframe.src = 'support/set-cookie.py?'+encodeURIComponent('ws_test_'+cookie_id+'=; Path=/; HttpOnly; Expires=Sun, 06 Nov 1994 08:49:37 GMT'); + iframe.onload = done; + }); + document.body.appendChild(iframe); +}, null, {timeout:9900}) +</script> diff --git a/websockets/cookies/005.html b/websockets/cookies/005.html index 9f93fc4..e7aefd5 100644 --- a/websockets/cookies/005.html +++ b/websockets/cookies/005.html
@@ -1,32 +1,32 @@ -<!doctype html> -<title>WebSockets: setting HttpOnly cookies in ws response, checking ws request</title> -<meta name=timeout content=long> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -setup({explicit_done:true}) -var cookie_id = ((new Date())-0) + '.' + Math.random(); - -var t = async_test(function(t) { - var iframe = document.createElement('iframe'); - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/set-cookie_http?'+cookie_id); - ws.onopen = t.step_func(function(e) { - var ws2 = new WebSocket(SCHEME_DOMAIN_PORT+'/echo-cookie'); - ws2.onmessage = t.step_func(function(e) { - ws.close(); - ws2.close(); - assert_regexp_match(e.data, new RegExp('ws_test_'+cookie_id+'=test')); - t.done(); - }); - }); - ws.onclose = t.step_func(function() {assert_unreached()}); - - add_result_callback(function() { - iframe.src = 'support/set-cookie.py?'+encodeURIComponent('ws_test_'+cookie_id+'=; Path=/; HttpOnly; Expires=Sun, 06 Nov 1994 08:49:37 GMT'); - iframe.onload = done; - }); - document.body.appendChild(iframe); -}) -</script> +<!doctype html> +<title>WebSockets: setting HttpOnly cookies in ws response, checking ws request</title> +<meta name=timeout content=long> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +setup({explicit_done:true}) +var cookie_id = ((new Date())-0) + '.' + Math.random(); + +var t = async_test(function(t) { + var iframe = document.createElement('iframe'); + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/set-cookie_http?'+cookie_id); + ws.onopen = t.step_func(function(e) { + var ws2 = new WebSocket(SCHEME_DOMAIN_PORT+'/echo-cookie'); + ws2.onmessage = t.step_func(function(e) { + ws.close(); + ws2.close(); + assert_regexp_match(e.data, new RegExp('ws_test_'+cookie_id+'=test')); + t.done(); + }); + }); + ws.onclose = t.step_func(function() {assert_unreached()}); + + add_result_callback(function() { + iframe.src = 'support/set-cookie.py?'+encodeURIComponent('ws_test_'+cookie_id+'=; Path=/; HttpOnly; Expires=Sun, 06 Nov 1994 08:49:37 GMT'); + iframe.onload = done; + }); + document.body.appendChild(iframe); +}) +</script> diff --git a/websockets/cookies/006.html b/websockets/cookies/006.html index 120b63b..05c8480 100644 --- a/websockets/cookies/006.html +++ b/websockets/cookies/006.html
@@ -1,27 +1,27 @@ -<!doctype html> -<title>WebSockets: setting Secure cookie with document.cookie, checking ws request</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -var cookie_id = ((new Date())-0) + '.' + Math.random(); -async_test(function(t) { - if (window.WebSocket) { - document.cookie = 'ws_test_'+cookie_id+'=test; Path=/; Secure'; - } - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo-cookie'); - ws.onmessage = t.step_func(function(e) { - ws.close(); - if (SCHEME_DOMAIN_PORT.substr(0,3) == 'wss') { - assert_regexp_match(e.data, new RegExp('ws_test_'+cookie_id+'=test')); - } else { - assert_false(new RegExp('ws_test_'+cookie_id+'=test').test(e.data)); - } - t.done(); - }) - ws.onclose = t.step_func(function() {assert_unreached()}); -}); -// remove cookie -document.cookie = 'ws_test_'+cookie_id+'; Path=/; Secure; Expires=Sun, 06 Nov 1994 08:49:37 GMT'; -</script> +<!doctype html> +<title>WebSockets: setting Secure cookie with document.cookie, checking ws request</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +var cookie_id = ((new Date())-0) + '.' + Math.random(); +async_test(function(t) { + if (window.WebSocket) { + document.cookie = 'ws_test_'+cookie_id+'=test; Path=/; Secure'; + } + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo-cookie'); + ws.onmessage = t.step_func(function(e) { + ws.close(); + if (SCHEME_DOMAIN_PORT.substr(0,3) == 'wss') { + assert_regexp_match(e.data, new RegExp('ws_test_'+cookie_id+'=test')); + } else { + assert_false(new RegExp('ws_test_'+cookie_id+'=test').test(e.data)); + } + t.done(); + }) + ws.onclose = t.step_func(function() {assert_unreached()}); +}); +// remove cookie +document.cookie = 'ws_test_'+cookie_id+'; Path=/; Secure; Expires=Sun, 06 Nov 1994 08:49:37 GMT'; +</script> diff --git a/websockets/cookies/007.html b/websockets/cookies/007.html index 17e27b4..efea696 100644 --- a/websockets/cookies/007.html +++ b/websockets/cookies/007.html
@@ -1,30 +1,30 @@ -<!doctype html> -<title>WebSockets: when to process set-cookie fields in ws response</title> -<meta name=timeout content=long> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -var cookie_id = ((new Date())-0) + '.' + Math.random(); -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/set-cookie?'+cookie_id); - ws.onopen = t.step_func(function(e) { - ws.close(); - assert_regexp_match(document.cookie, new RegExp('ws_test_'+cookie_id+'=test')); - // remove cookie - document.cookie = 'ws_test_'+cookie_id+'; Path=/; Expires=Sun, 06 Nov 1994 08:49:37 GMT'; - t.done(); - }); - ws.onclose = t.step_func(function() {assert_unreached()}); - - // sleep for 2 seconds with sync xhr - var sleep = new XMLHttpRequest(); - sleep.open('GET', '/common/blank.html?pipe=trickle(d2)', false); - sleep.send(null); - - if (new RegExp('ws_test_'+cookie_id+'=test').test(document.cookie)) { - assert_unreached('cookie was set during script execution'); - } -}, null, {timeout:12000}); -</script> +<!doctype html> +<title>WebSockets: when to process set-cookie fields in ws response</title> +<meta name=timeout content=long> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +var cookie_id = ((new Date())-0) + '.' + Math.random(); +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/set-cookie?'+cookie_id); + ws.onopen = t.step_func(function(e) { + ws.close(); + assert_regexp_match(document.cookie, new RegExp('ws_test_'+cookie_id+'=test')); + // remove cookie + document.cookie = 'ws_test_'+cookie_id+'; Path=/; Expires=Sun, 06 Nov 1994 08:49:37 GMT'; + t.done(); + }); + ws.onclose = t.step_func(function() {assert_unreached()}); + + // sleep for 2 seconds with sync xhr + var sleep = new XMLHttpRequest(); + sleep.open('GET', '/common/blank.html?pipe=trickle(d2)', false); + sleep.send(null); + + if (new RegExp('ws_test_'+cookie_id+'=test').test(document.cookie)) { + assert_unreached('cookie was set during script execution'); + } +}, null, {timeout:12000}); +</script> diff --git a/websockets/cookies/support/set-cookie.py b/websockets/cookies/support/set-cookie.py index d478f8d..8a47d7c 100644 --- a/websockets/cookies/support/set-cookie.py +++ b/websockets/cookies/support/set-cookie.py
@@ -1,5 +1,5 @@ -import urllib - -def main(request, response): - response.headers.set('Set-Cookie', urllib.unquote(request.url_parts.query)) - return [("Content-Type", "text/plain")], "" +import urllib + +def main(request, response): + response.headers.set('Set-Cookie', urllib.unquote(request.url_parts.query)) + return [("Content-Type", "text/plain")], "" diff --git a/websockets/handlers/wrong_accept_key_wsh.py b/websockets/handlers/wrong_accept_key_wsh.py index 60ffbb0..d38ab81 100755 --- a/websockets/handlers/wrong_accept_key_wsh.py +++ b/websockets/handlers/wrong_accept_key_wsh.py
@@ -1,13 +1,13 @@ -#!/usr/bin/python - -import sys, urllib, time -from mod_pywebsocket import common, msgutil, util - -def web_socket_do_extra_handshake(request): - request.connection.write('HTTP/1.1 101 Switching Protocols:\x0D\x0AConnection: Upgrade\x0D\x0AUpgrade: WebSocket\x0D\x0ASec-WebSocket-Origin: '+request.ws_origin+'\x0D\x0ASec-WebSocket-Accept: thisisawrongacceptkey\x0D\x0A\x0D\x0A') - return - -def web_socket_transfer_data(request): - while True: - request.ws_stream.send_message('test', binary=False) - return +#!/usr/bin/python + +import sys, urllib, time +from mod_pywebsocket import common, msgutil, util + +def web_socket_do_extra_handshake(request): + request.connection.write('HTTP/1.1 101 Switching Protocols:\x0D\x0AConnection: Upgrade\x0D\x0AUpgrade: WebSocket\x0D\x0ASec-WebSocket-Origin: '+request.ws_origin+'\x0D\x0ASec-WebSocket-Accept: thisisawrongacceptkey\x0D\x0A\x0D\x0A') + return + +def web_socket_transfer_data(request): + while True: + request.ws_stream.send_message('test', binary=False) + return diff --git a/websockets/interfaces/CloseEvent/001.html b/websockets/interfaces/CloseEvent/001.html index 44585f4..20ee62f 100644 --- a/websockets/interfaces/CloseEvent/001.html +++ b/websockets/interfaces/CloseEvent/001.html
@@ -1,10 +1,10 @@ - -<!doctype html> -<title>WebSockets: window.CloseEvent</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function(){assert_not_equals(window.CloseEvent, undefined, 'window.CloseEvent')}); -</script> + +<!doctype html> +<title>WebSockets: window.CloseEvent</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function(){assert_not_equals(window.CloseEvent, undefined, 'window.CloseEvent')}); +</script> diff --git a/websockets/interfaces/CloseEvent/002.html b/websockets/interfaces/CloseEvent/002.html index 21fda70..a30c338 100644 --- a/websockets/interfaces/CloseEvent/002.html +++ b/websockets/interfaces/CloseEvent/002.html
@@ -1,20 +1,20 @@ -<!doctype html> -<title>WebSockets: dispatching a CloseEvent</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var e = document.createEvent('CloseEvent'); - e.initCloseEvent('foo', false, false, false); - var div = document.createElement('div'); - div.addEventListener('foo', t.step_func(function(ev) { - assert_equals(ev.bubbles, false); - assert_equals(ev.cancelable, false); - assert_equals(ev.wasClean, false); - t.done(); - }), false); - div.dispatchEvent(e); -}); -</script> +<!doctype html> +<title>WebSockets: dispatching a CloseEvent</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var e = document.createEvent('CloseEvent'); + e.initCloseEvent('foo', false, false, false); + var div = document.createElement('div'); + div.addEventListener('foo', t.step_func(function(ev) { + assert_equals(ev.bubbles, false); + assert_equals(ev.cancelable, false); + assert_equals(ev.wasClean, false); + t.done(); + }), false); + div.dispatchEvent(e); +}); +</script> diff --git a/websockets/interfaces/CloseEvent/003.html b/websockets/interfaces/CloseEvent/003.html index 5be8c88..8a27e9f 100644 --- a/websockets/interfaces/CloseEvent/003.html +++ b/websockets/interfaces/CloseEvent/003.html
@@ -1,20 +1,20 @@ -<!doctype html> -<title>WebSockets: dispatching a CloseEvent</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var e = document.createEvent('CloseEvent'); - e.initCloseEvent('foo', true, true, true); - var div = document.createElement('div'); - div.addEventListener('foo', t.step_func(function(ev) { - assert_equals(ev.bubbles, true); - assert_equals(ev.cancelable, true); - assert_equals(ev.wasClean, true); - t.done(); - }), false); - div.dispatchEvent(e); -}); -</script> +<!doctype html> +<title>WebSockets: dispatching a CloseEvent</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var e = document.createEvent('CloseEvent'); + e.initCloseEvent('foo', true, true, true); + var div = document.createElement('div'); + div.addEventListener('foo', t.step_func(function(ev) { + assert_equals(ev.bubbles, true); + assert_equals(ev.cancelable, true); + assert_equals(ev.wasClean, true); + t.done(); + }), false); + div.dispatchEvent(e); +}); +</script> diff --git a/websockets/interfaces/CloseEvent/004.html b/websockets/interfaces/CloseEvent/004.html index 07d56ac..78a7b50 100644 --- a/websockets/interfaces/CloseEvent/004.html +++ b/websockets/interfaces/CloseEvent/004.html
@@ -1,21 +1,21 @@ -<!doctype html> -<title>WebSockets: wasClean, true</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); - ws.onopen = t.step_func(function(e) { - ws.send('Test'); - }); - ws.onmessage = t.step_func(function(e) { - ws.close(); - }); - ws.onclose = t.step_func(function(e) { - assert_equals(e.wasClean,true); - t.done(); - }); -}, null, {timeout:2000}); -</script> +<!doctype html> +<title>WebSockets: wasClean, true</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); + ws.onopen = t.step_func(function(e) { + ws.send('Test'); + }); + ws.onmessage = t.step_func(function(e) { + ws.close(); + }); + ws.onclose = t.step_func(function(e) { + assert_equals(e.wasClean,true); + t.done(); + }); +}, null, {timeout:2000}); +</script> diff --git a/websockets/interfaces/WebSocket/bufferedAmount/001.html b/websockets/interfaces/WebSocket/bufferedAmount/001.html index 7cf4a29..8d1ef3c 100644 --- a/websockets/interfaces/WebSocket/bufferedAmount/001.html +++ b/websockets/interfaces/WebSocket/bufferedAmount/001.html
@@ -1,12 +1,12 @@ -<!doctype html> -<title>WebSockets: getting bufferedAmount</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function(){ - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - assert_equals(ws.bufferedAmount, 0); -}); -</script> +<!doctype html> +<title>WebSockets: getting bufferedAmount</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function(){ + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + assert_equals(ws.bufferedAmount, 0); +}); +</script> diff --git a/websockets/interfaces/WebSocket/bufferedAmount/002.html b/websockets/interfaces/WebSocket/bufferedAmount/002.html index 2853dab..32cc8ad 100644 --- a/websockets/interfaces/WebSocket/bufferedAmount/002.html +++ b/websockets/interfaces/WebSocket/bufferedAmount/002.html
@@ -1,13 +1,13 @@ -<!doctype html> -<title>WebSockets: setting bufferedAmount</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function(){ - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - ws.bufferedAmount = 5; - assert_equals(ws.bufferedAmount, 0); -}); -</script> +<!doctype html> +<title>WebSockets: setting bufferedAmount</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function(){ + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + ws.bufferedAmount = 5; + assert_equals(ws.bufferedAmount, 0); +}); +</script> diff --git a/websockets/interfaces/WebSocket/bufferedAmount/003.html b/websockets/interfaces/WebSocket/bufferedAmount/003.html index f54e7df..41d03d1 100644 --- a/websockets/interfaces/WebSocket/bufferedAmount/003.html +++ b/websockets/interfaces/WebSocket/bufferedAmount/003.html
@@ -1,50 +1,50 @@ -<!doctype html> -<title>WebSockets: bufferedAmount after send()ing</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t){ - // bufferedAmount should increase sync in the send() method and decrease between - // events in the event loop (so never while script is running). - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); - ws.onopen = t.step_func(function(e) { - ws.send('x'); - assert_equals(ws.bufferedAmount, 1, 'bufferedAmount after sent "x"'); - ws.send('\u00E5'); - assert_equals(ws.bufferedAmount, 1+2, 'bufferedAmount after sent "x", "\u00E5"'); - ws.send('\u5336'); - assert_equals(ws.bufferedAmount, 1+2+3, 'bufferedAmount after sent "x", "\u00E5", "\u5336"'); - ws.send('\uD801\uDC7E'); - assert_equals(ws.bufferedAmount, 1+2+3+4, 'bufferedAmount after sent "x", "\u00E5", "\u5336", "\uD801\uDC7E"'); - }) - var i = 0; - ws.onmessage = t.step_func(function(e) { - i++; - switch(i) { - case 1: - assert_equals(e.data, 'x'); - assert_true(ws.bufferedAmount < 2+3+4 + 1, 'bufferedAmount after received "x"'); - break; - case 2: - assert_equals(e.data, '\u00E5'); - assert_true(ws.bufferedAmount < 3+4 + 1, 'bufferedAmount after received "x", "\u00E5"'); - break; - case 3: - assert_equals(e.data, '\u5336'); - assert_true(ws.bufferedAmount < 4 + 1, 'bufferedAmount after received "x", "\u00E5", "\u5336"'); - break; - case 4: - assert_equals(e.data, '\uD801\uDC7E'); - assert_equals(ws.bufferedAmount, 0, 'bufferedAmount after received "x", "\u00E5", "\u5336", "\uD801\uDC7E"'); - t.done(); - break; - default: - assert_unreached(i); - } - }) - ws.onerror = ws.onclose = t.step_func(function() {assert_unreached()}); -}); -</script> - +<!doctype html> +<title>WebSockets: bufferedAmount after send()ing</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t){ + // bufferedAmount should increase sync in the send() method and decrease between + // events in the event loop (so never while script is running). + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); + ws.onopen = t.step_func(function(e) { + ws.send('x'); + assert_equals(ws.bufferedAmount, 1, 'bufferedAmount after sent "x"'); + ws.send('\u00E5'); + assert_equals(ws.bufferedAmount, 1+2, 'bufferedAmount after sent "x", "\u00E5"'); + ws.send('\u5336'); + assert_equals(ws.bufferedAmount, 1+2+3, 'bufferedAmount after sent "x", "\u00E5", "\u5336"'); + ws.send('\uD801\uDC7E'); + assert_equals(ws.bufferedAmount, 1+2+3+4, 'bufferedAmount after sent "x", "\u00E5", "\u5336", "\uD801\uDC7E"'); + }) + var i = 0; + ws.onmessage = t.step_func(function(e) { + i++; + switch(i) { + case 1: + assert_equals(e.data, 'x'); + assert_true(ws.bufferedAmount < 2+3+4 + 1, 'bufferedAmount after received "x"'); + break; + case 2: + assert_equals(e.data, '\u00E5'); + assert_true(ws.bufferedAmount < 3+4 + 1, 'bufferedAmount after received "x", "\u00E5"'); + break; + case 3: + assert_equals(e.data, '\u5336'); + assert_true(ws.bufferedAmount < 4 + 1, 'bufferedAmount after received "x", "\u00E5", "\u5336"'); + break; + case 4: + assert_equals(e.data, '\uD801\uDC7E'); + assert_equals(ws.bufferedAmount, 0, 'bufferedAmount after received "x", "\u00E5", "\u5336", "\uD801\uDC7E"'); + t.done(); + break; + default: + assert_unreached(i); + } + }) + ws.onerror = ws.onclose = t.step_func(function() {assert_unreached()}); +}); +</script> + diff --git a/websockets/interfaces/WebSocket/bufferedAmount/004.html b/websockets/interfaces/WebSocket/bufferedAmount/004.html index e31f01d..f1300ec 100644 --- a/websockets/interfaces/WebSocket/bufferedAmount/004.html +++ b/websockets/interfaces/WebSocket/bufferedAmount/004.html
@@ -1,17 +1,17 @@ -<!doctype html> -<title>WebSockets: delete bufferedAmount</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function(){ - delete WebSocket.prototype.bufferedAmount; - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); - assert_equals(ws.bufferedAmount, 0, 'after attempt to delete WebSocket.prototype.bufferedAmount'); - ws.close(); - delete ws.bufferedAmount; - assert_equals(ws.bufferedAmount, 0, 'after attempt to delete ws.bufferedAmount'); -}); -</script> - +<!doctype html> +<title>WebSockets: delete bufferedAmount</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function(){ + delete WebSocket.prototype.bufferedAmount; + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); + assert_equals(ws.bufferedAmount, 0, 'after attempt to delete WebSocket.prototype.bufferedAmount'); + ws.close(); + delete ws.bufferedAmount; + assert_equals(ws.bufferedAmount, 0, 'after attempt to delete ws.bufferedAmount'); +}); +</script> + diff --git a/websockets/interfaces/WebSocket/bufferedAmount/005.html b/websockets/interfaces/WebSocket/bufferedAmount/005.html index 57b9f74..5a8330a 100644 --- a/websockets/interfaces/WebSocket/bufferedAmount/005.html +++ b/websockets/interfaces/WebSocket/bufferedAmount/005.html
@@ -1,15 +1,15 @@ -<!doctype html> -<title>WebSockets: defineProperty getter for bufferedAmount</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function(){ - Object.defineProperty(WebSocket.prototype, 'bufferedAmount', { - get: function() { return 'foo'; } - }); - var ws = new WebSocket('ws://example.invalid/'); - assert_equals(ws.bufferedAmount, 'foo'); -}); -</script> +<!doctype html> +<title>WebSockets: defineProperty getter for bufferedAmount</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function(){ + Object.defineProperty(WebSocket.prototype, 'bufferedAmount', { + get: function() { return 'foo'; } + }); + var ws = new WebSocket('ws://example.invalid/'); + assert_equals(ws.bufferedAmount, 'foo'); +}); +</script> diff --git a/websockets/interfaces/WebSocket/bufferedAmount/006.html b/websockets/interfaces/WebSocket/bufferedAmount/006.html index aae9dcc..35ef248 100644 --- a/websockets/interfaces/WebSocket/bufferedAmount/006.html +++ b/websockets/interfaces/WebSocket/bufferedAmount/006.html
@@ -1,17 +1,17 @@ -<!doctype html> -<title>WebSockets: defineProperty setter for bufferedAmount</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function() { - window.setter_ran = false; - Object.defineProperty(WebSocket.prototype, 'bufferedAmount', { - set: function(v) { window[v] = true; } - }); - var ws = new WebSocket('ws://example.invalid/'); - ws.bufferedAmount = 'setter_ran'; - assert_true(setter_ran); -}); -</script> +<!doctype html> +<title>WebSockets: defineProperty setter for bufferedAmount</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function() { + window.setter_ran = false; + Object.defineProperty(WebSocket.prototype, 'bufferedAmount', { + set: function(v) { window[v] = true; } + }); + var ws = new WebSocket('ws://example.invalid/'); + ws.bufferedAmount = 'setter_ran'; + assert_true(setter_ran); +}); +</script> diff --git a/websockets/interfaces/WebSocket/bufferedAmount/007.html b/websockets/interfaces/WebSocket/bufferedAmount/007.html index 33fb0ad..ecd033a 100644 --- a/websockets/interfaces/WebSocket/bufferedAmount/007.html +++ b/websockets/interfaces/WebSocket/bufferedAmount/007.html
@@ -1,24 +1,24 @@ -<!doctype html> -<title>WebSockets: bufferedAmount for blob</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); - var data = ""; - var datasize = 10; - ws.onopen = t.step_func(function(e) { - ws.binaryType = "blob"; - data = new ArrayBuffer(datasize); - ws.send(data); - assert_equals(ws.bufferedAmount, data.byteLength); - }); - ws.onmessage = t.step_func(function(e) { - assert_true(e.data instanceof Blob); - assert_equals(e.data.size, datasize); - t.done(); - }); -}); -</script> +<!doctype html> +<title>WebSockets: bufferedAmount for blob</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); + var data = ""; + var datasize = 10; + ws.onopen = t.step_func(function(e) { + ws.binaryType = "blob"; + data = new ArrayBuffer(datasize); + ws.send(data); + assert_equals(ws.bufferedAmount, data.byteLength); + }); + ws.onmessage = t.step_func(function(e) { + assert_true(e.data instanceof Blob); + assert_equals(e.data.size, datasize); + t.done(); + }); +}); +</script> diff --git a/websockets/interfaces/WebSocket/bufferedAmount/008.html b/websockets/interfaces/WebSocket/bufferedAmount/008.html index 1326ecf..60d9eaa 100644 --- a/websockets/interfaces/WebSocket/bufferedAmount/008.html +++ b/websockets/interfaces/WebSocket/bufferedAmount/008.html
@@ -1,24 +1,24 @@ -<!doctype html> -<title>WebSockets: bufferedAmount for ArrayBuffer</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); - var data = ""; - var datasize = 10; - ws.onopen = t.step_func(function(e) { - ws.binaryType = "arraybuffer"; - data = new ArrayBuffer(datasize); - ws.send(data); - assert_equals(ws.bufferedAmount, data.byteLength); - }) - ws.onmessage = t.step_func(function(e) { - assert_equals(e.data.byteLength, datasize); - t.done(); - }) - -}); -</script> +<!doctype html> +<title>WebSockets: bufferedAmount for ArrayBuffer</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); + var data = ""; + var datasize = 10; + ws.onopen = t.step_func(function(e) { + ws.binaryType = "arraybuffer"; + data = new ArrayBuffer(datasize); + ws.send(data); + assert_equals(ws.bufferedAmount, data.byteLength); + }) + ws.onmessage = t.step_func(function(e) { + assert_equals(e.data.byteLength, datasize); + t.done(); + }) + +}); +</script> diff --git a/websockets/interfaces/WebSocket/bufferedAmount/009.html b/websockets/interfaces/WebSocket/bufferedAmount/009.html index cd4295f..1ea675b 100644 --- a/websockets/interfaces/WebSocket/bufferedAmount/009.html +++ b/websockets/interfaces/WebSocket/bufferedAmount/009.html
@@ -1,25 +1,25 @@ -<!doctype html> -<title>WebSockets: bufferedAmount for 65K data</title> -<meta name=timeout content=long> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); - var data = ""; - ws.onopen = t.step_func(function(e) { - for (var i = 0; i < 65000; i++) { - data = data + "x"; - } - ws.send(data); - assert_equals(data.length, ws.bufferedAmount); - }); - ws.onmessage = t.step_func(function(e) { - assert_equals(e.data, data); - t.done(); - }) - -}, null, {timeout:20000}); -</script> +<!doctype html> +<title>WebSockets: bufferedAmount for 65K data</title> +<meta name=timeout content=long> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); + var data = ""; + ws.onopen = t.step_func(function(e) { + for (var i = 0; i < 65000; i++) { + data = data + "x"; + } + ws.send(data); + assert_equals(data.length, ws.bufferedAmount); + }); + ws.onmessage = t.step_func(function(e) { + assert_equals(e.data, data); + t.done(); + }) + +}, null, {timeout:20000}); +</script> diff --git a/websockets/interfaces/WebSocket/bufferedAmount/010.html b/websockets/interfaces/WebSocket/bufferedAmount/010.html index 863615e..33846d8 100644 --- a/websockets/interfaces/WebSocket/bufferedAmount/010.html +++ b/websockets/interfaces/WebSocket/bufferedAmount/010.html
@@ -1,20 +1,20 @@ -<!doctype html> -<title>WebSockets: bufferedAmount for unicode data</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); - var data = "¥¥¥¥¥¥"; - ws.onopen = t.step_func(function(e) { - ws.send(data); - assert_equals(data.length * 2, ws.bufferedAmount); - }); - ws.onmessage = t.step_func(function(e) { - assert_equals(e.data, data); - t.done(); - }); -}); -</script> +<!doctype html> +<title>WebSockets: bufferedAmount for unicode data</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); + var data = "¥¥¥¥¥¥"; + ws.onopen = t.step_func(function(e) { + ws.send(data); + assert_equals(data.length * 2, ws.bufferedAmount); + }); + ws.onmessage = t.step_func(function(e) { + assert_equals(e.data, data); + t.done(); + }); +}); +</script> diff --git a/websockets/interfaces/WebSocket/close/001.html b/websockets/interfaces/WebSocket/close/001.html index 2d8aa30..fa87edd 100644 --- a/websockets/interfaces/WebSocket/close/001.html +++ b/websockets/interfaces/WebSocket/close/001.html
@@ -1,23 +1,23 @@ -<!doctype html> -<title>WebSockets: close()</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t){ - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - ws.onclose = t.step_func( - function(e) { - assert_equals(e instanceof CloseEvent, true, 'e instanceof CloseEvent'); - assert_equals(e.wasClean, false, 'e.wasClean'); - e.wasClean = true; - assert_equals(e.wasClean, false, 'e.wasClean = true'); - delete e.wasClean; - assert_equals(e.wasClean, false, 'delete e.wasClean'); - t.done(); - }); - ws.close(); - assert_equals(ws.readyState, ws.CLOSING); -}, undefined, {timeout:9900}); -</script> +<!doctype html> +<title>WebSockets: close()</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t){ + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + ws.onclose = t.step_func( + function(e) { + assert_equals(e instanceof CloseEvent, true, 'e instanceof CloseEvent'); + assert_equals(e.wasClean, false, 'e.wasClean'); + e.wasClean = true; + assert_equals(e.wasClean, false, 'e.wasClean = true'); + delete e.wasClean; + assert_equals(e.wasClean, false, 'delete e.wasClean'); + t.done(); + }); + ws.close(); + assert_equals(ws.readyState, ws.CLOSING); +}, undefined, {timeout:9900}); +</script> diff --git a/websockets/interfaces/WebSocket/close/002.html b/websockets/interfaces/WebSocket/close/002.html index 57ec699..61aa366 100644 --- a/websockets/interfaces/WebSocket/close/002.html +++ b/websockets/interfaces/WebSocket/close/002.html
@@ -1,13 +1,13 @@ -<!doctype html> -<title>WebSockets: replacing close</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function(){ - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - ws.close = 5; - assert_equals(ws.close, 5); -}); -</script> +<!doctype html> +<title>WebSockets: replacing close</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function(){ + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + ws.close = 5; + assert_equals(ws.close, 5); +}); +</script> diff --git a/websockets/interfaces/WebSocket/close/003.html b/websockets/interfaces/WebSocket/close/003.html index dee0490..a9f85f9 100644 --- a/websockets/interfaces/WebSocket/close/003.html +++ b/websockets/interfaces/WebSocket/close/003.html
@@ -1,22 +1,22 @@ -<!doctype html> -<title>WebSockets: close() several times</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -var i = 0; -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - ws.onclose = function(e) { - i++; - } - ws.close(); - ws.close(); - ws.close(); - setTimeout(t.step_func(function(){ - assert_equals(i, 1); - t.done() - }), 50); -}); -</script> +<!doctype html> +<title>WebSockets: close() several times</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +var i = 0; +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + ws.onclose = function(e) { + i++; + } + ws.close(); + ws.close(); + ws.close(); + setTimeout(t.step_func(function(){ + assert_equals(i, 1); + t.done() + }), 50); +}); +</script> diff --git a/websockets/interfaces/WebSocket/close/004.html b/websockets/interfaces/WebSocket/close/004.html index 980740f..975ea23 100644 --- a/websockets/interfaces/WebSocket/close/004.html +++ b/websockets/interfaces/WebSocket/close/004.html
@@ -1,12 +1,12 @@ -<!doctype html> -<title>WebSockets: close() return value</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function(){ - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - assert_equals(ws.close(), undefined); -}); -</script> +<!doctype html> +<title>WebSockets: close() return value</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function(){ + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + assert_equals(ws.close(), undefined); +}); +</script> diff --git a/websockets/interfaces/WebSocket/close/005.html b/websockets/interfaces/WebSocket/close/005.html index 0e79d50..0271ed6 100644 --- a/websockets/interfaces/WebSocket/close/005.html +++ b/websockets/interfaces/WebSocket/close/005.html
@@ -1,27 +1,27 @@ -<!doctype html> -<title>WebSockets: close() in close event handler</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t){ - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - var i = 0; - ws.onclose = t.step_func(function(e) { - i++; - if (i == 1) { - assert_equals(ws.readyState, ws.CLOSED); - ws.close(); - assert_equals(ws.readyState, ws.CLOSED); - } - setTimeout( - t.step_func(function() { - assert_equals(i, 1); - t.done(); - }), 50); - }); - ws.close(); - assert_equals(ws.readyState, ws.CLOSING); -}, undefined, {timeout:9900}); -</script> +<!doctype html> +<title>WebSockets: close() in close event handler</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t){ + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + var i = 0; + ws.onclose = t.step_func(function(e) { + i++; + if (i == 1) { + assert_equals(ws.readyState, ws.CLOSED); + ws.close(); + assert_equals(ws.readyState, ws.CLOSED); + } + setTimeout( + t.step_func(function() { + assert_equals(i, 1); + t.done(); + }), 50); + }); + ws.close(); + assert_equals(ws.readyState, ws.CLOSING); +}, undefined, {timeout:9900}); +</script> diff --git a/websockets/interfaces/WebSocket/close/006.html b/websockets/interfaces/WebSocket/close/006.html index b117913..6a657e9 100644 --- a/websockets/interfaces/WebSocket/close/006.html +++ b/websockets/interfaces/WebSocket/close/006.html
@@ -1,23 +1,23 @@ -<!doctype html> -<title>WebSockets: close() when connecting</title> -<meta name=timeout content=long> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t){ - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/sleep_10_v13'); - setTimeout(t.step_func(function(){ - assert_equals(ws.readyState, ws.CONNECTING); - ws.close(); - assert_equals(ws.readyState, ws.CLOSING); - ws.onclose = t.step_func(function(e) { - assert_equals(ws.readyState, ws.CLOSED); - assert_equals(e.wasClean, false); - t.done(); - }); - }), 1000); - ws.onopen = ws.onclose = t.step_func(assert_unreached); -}, undefined, {timeout:12000}); -</script> +<!doctype html> +<title>WebSockets: close() when connecting</title> +<meta name=timeout content=long> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t){ + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/sleep_10_v13'); + setTimeout(t.step_func(function(){ + assert_equals(ws.readyState, ws.CONNECTING); + ws.close(); + assert_equals(ws.readyState, ws.CLOSING); + ws.onclose = t.step_func(function(e) { + assert_equals(ws.readyState, ws.CLOSED); + assert_equals(e.wasClean, false); + t.done(); + }); + }), 1000); + ws.onopen = ws.onclose = t.step_func(assert_unreached); +}, undefined, {timeout:12000}); +</script> diff --git a/websockets/interfaces/WebSocket/constants/001.html b/websockets/interfaces/WebSocket/constants/001.html index b2e71a9..061a4d4 100644 --- a/websockets/interfaces/WebSocket/constants/001.html +++ b/websockets/interfaces/WebSocket/constants/001.html
@@ -1,15 +1,15 @@ -<!doctype html> -<title>WebSockets: getting constants on constructor</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -var constants = ['CONNECTING', 'OPEN', 'CLOSING', 'CLOSED']; -for (var i = 0; i < constants.length; ++i) { - test(function(){ - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - assert_equals(WebSocket[constants[i]], i, 'WebSocket.'+constants[i]); - }, "Constants on constructors " + constants[i]); -}; -</script> +<!doctype html> +<title>WebSockets: getting constants on constructor</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +var constants = ['CONNECTING', 'OPEN', 'CLOSING', 'CLOSED']; +for (var i = 0; i < constants.length; ++i) { + test(function(){ + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + assert_equals(WebSocket[constants[i]], i, 'WebSocket.'+constants[i]); + }, "Constants on constructors " + constants[i]); +}; +</script> diff --git a/websockets/interfaces/WebSocket/constants/002.html b/websockets/interfaces/WebSocket/constants/002.html index 137e95b..6c1330d 100644 --- a/websockets/interfaces/WebSocket/constants/002.html +++ b/websockets/interfaces/WebSocket/constants/002.html
@@ -1,22 +1,22 @@ -<!doctype html> -<title>WebSockets: setting constants</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -// this test is testing WebIDL stuff -var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); -var constants = ['CONNECTING', 'OPEN', 'CLOSING', 'CLOSED']; -for (var i = 0; i < constants.length; ++i) { - test(function() { - WebSocket[constants[i]] = 5; // should be ignored, has { ReadOnly } - WebSocket.prototype[constants[i]] = 5; // should be ignored, has { ReadOnly } - ws[constants[i]] = 5; // should be ignored, { ReadOnly } is inherited from prototype - assert_equals(WebSocket[constants[i]], i, 'WebSocket.'+constants[i]); - assert_equals(WebSocket.prototype[constants[i]], i, 'WebSocket.prototype.'+constants[i]); - assert_equals(ws[constants[i]], i, 'ws.'+constants[i]); - }, "Readonly constants " + constants[i]); -}; -</script> - +<!doctype html> +<title>WebSockets: setting constants</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +// this test is testing WebIDL stuff +var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); +var constants = ['CONNECTING', 'OPEN', 'CLOSING', 'CLOSED']; +for (var i = 0; i < constants.length; ++i) { + test(function() { + WebSocket[constants[i]] = 5; // should be ignored, has { ReadOnly } + WebSocket.prototype[constants[i]] = 5; // should be ignored, has { ReadOnly } + ws[constants[i]] = 5; // should be ignored, { ReadOnly } is inherited from prototype + assert_equals(WebSocket[constants[i]], i, 'WebSocket.'+constants[i]); + assert_equals(WebSocket.prototype[constants[i]], i, 'WebSocket.prototype.'+constants[i]); + assert_equals(ws[constants[i]], i, 'ws.'+constants[i]); + }, "Readonly constants " + constants[i]); +}; +</script> + diff --git a/websockets/interfaces/WebSocket/constants/003.html b/websockets/interfaces/WebSocket/constants/003.html index 8442a32..642e444 100644 --- a/websockets/interfaces/WebSocket/constants/003.html +++ b/websockets/interfaces/WebSocket/constants/003.html
@@ -1,20 +1,20 @@ -<!doctype html> -<title>WebSockets: deleting constants</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -var constants = ['CONNECTING', 'OPEN', 'CLOSING', 'CLOSED']; -for (var i = 0; i < constants.length; ++i) { - test(function(){ - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - delete WebSocket[constants[i]]; // should be ignored, has { DontDelete } - delete WebSocket.prototype[constants[i]]; // should be ignored, has { DontDelete } - delete ws[constants[i]]; // should be ignored, there is no such property on the object - assert_equals(WebSocket[constants[i]], i, 'WebSocket.'+constants[i]); - assert_equals(WebSocket.prototype[constants[i]], i, 'WebSocket.prototype.'+constants[i]); - assert_equals(ws[constants[i]], i, 'ws.'+constants[i]); - }) -}; -</script> +<!doctype html> +<title>WebSockets: deleting constants</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +var constants = ['CONNECTING', 'OPEN', 'CLOSING', 'CLOSED']; +for (var i = 0; i < constants.length; ++i) { + test(function(){ + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + delete WebSocket[constants[i]]; // should be ignored, has { DontDelete } + delete WebSocket.prototype[constants[i]]; // should be ignored, has { DontDelete } + delete ws[constants[i]]; // should be ignored, there is no such property on the object + assert_equals(WebSocket[constants[i]], i, 'WebSocket.'+constants[i]); + assert_equals(WebSocket.prototype[constants[i]], i, 'WebSocket.prototype.'+constants[i]); + assert_equals(ws[constants[i]], i, 'ws.'+constants[i]); + }) +}; +</script> diff --git a/websockets/interfaces/WebSocket/constants/004.html b/websockets/interfaces/WebSocket/constants/004.html index f201f51..4b33064 100644 --- a/websockets/interfaces/WebSocket/constants/004.html +++ b/websockets/interfaces/WebSocket/constants/004.html
@@ -1,19 +1,19 @@ -<!doctype html> -<title>WebSockets: getting constants on prototype and object</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -var constants = ['CONNECTING', 'OPEN', 'CLOSING', 'CLOSED']; -for (var i = 0; i < constants.length; ++i) { - test(function() { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - assert_equals(WebSocket.prototype[constants[i]], i); - }, 'WebSocket.prototype.'+constants[i]); - test(function() { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - assert_equals(ws[constants[i]], i); - }, 'ws.'+constants[i]); -}; -</script> +<!doctype html> +<title>WebSockets: getting constants on prototype and object</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +var constants = ['CONNECTING', 'OPEN', 'CLOSING', 'CLOSED']; +for (var i = 0; i < constants.length; ++i) { + test(function() { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + assert_equals(WebSocket.prototype[constants[i]], i); + }, 'WebSocket.prototype.'+constants[i]); + test(function() { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + assert_equals(ws[constants[i]], i); + }, 'ws.'+constants[i]); +}; +</script> diff --git a/websockets/interfaces/WebSocket/constants/005.html b/websockets/interfaces/WebSocket/constants/005.html index 57acfd2..93b1200 100644 --- a/websockets/interfaces/WebSocket/constants/005.html +++ b/websockets/interfaces/WebSocket/constants/005.html
@@ -1,18 +1,18 @@ -<!doctype html> -<title>WebSockets: defineProperty getter for constants</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -var constants = ['CONNECTING', 'OPEN', 'CLOSING', 'CLOSED']; -for (var i = 0; i < constants.length; ++i) { - test(function() { - assert_throws(new TypeError(), function() { - Object.defineProperty(WebSocket.prototype, constants[i], { - get: function() { return 'foo'; } - }); - }); - }, "defineProperty getter " + constants[i]); -}; -</script> +<!doctype html> +<title>WebSockets: defineProperty getter for constants</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +var constants = ['CONNECTING', 'OPEN', 'CLOSING', 'CLOSED']; +for (var i = 0; i < constants.length; ++i) { + test(function() { + assert_throws(new TypeError(), function() { + Object.defineProperty(WebSocket.prototype, constants[i], { + get: function() { return 'foo'; } + }); + }); + }, "defineProperty getter " + constants[i]); +}; +</script> diff --git a/websockets/interfaces/WebSocket/constants/006.html b/websockets/interfaces/WebSocket/constants/006.html index a593d73..0a17f78 100644 --- a/websockets/interfaces/WebSocket/constants/006.html +++ b/websockets/interfaces/WebSocket/constants/006.html
@@ -1,18 +1,18 @@ -<!doctype html> -<title>WebSockets: defineProperty setter for constants</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -var constants = ['CONNECTING', 'OPEN', 'CLOSING', 'CLOSED']; -for (var i = 0; i < constants.length; ++i) { - test(function() { - assert_throws(new TypeError(), function(){ - Object.defineProperty(WebSocket.prototype, constants[i], { - set: function() { return 'foo'; } - }); - }); - }, "defineProperty setter " + constants[i]) -}; -</script> +<!doctype html> +<title>WebSockets: defineProperty setter for constants</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +var constants = ['CONNECTING', 'OPEN', 'CLOSING', 'CLOSED']; +for (var i = 0; i < constants.length; ++i) { + test(function() { + assert_throws(new TypeError(), function(){ + Object.defineProperty(WebSocket.prototype, constants[i], { + set: function() { return 'foo'; } + }); + }); + }, "defineProperty setter " + constants[i]) +}; +</script> diff --git a/websockets/interfaces/WebSocket/events/001.html b/websockets/interfaces/WebSocket/events/001.html index e4454df..bb790bf 100644 --- a/websockets/interfaces/WebSocket/events/001.html +++ b/websockets/interfaces/WebSocket/events/001.html
@@ -1,15 +1,15 @@ -<!doctype html> -<title>WebSockets: getting on*</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -var events = ['open', 'message', 'error', 'close']; -for (var i = 0; i < events.length; ++i) { - test(function(){ - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - assert_equals(ws['on'+events[i]], null, 'on'+events[i]); - }); -}; -</script> +<!doctype html> +<title>WebSockets: getting on*</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +var events = ['open', 'message', 'error', 'close']; +for (var i = 0; i < events.length; ++i) { + test(function(){ + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + assert_equals(ws['on'+events[i]], null, 'on'+events[i]); + }); +}; +</script> diff --git a/websockets/interfaces/WebSocket/events/002.html b/websockets/interfaces/WebSocket/events/002.html index 81d0f21..caac06f 100644 --- a/websockets/interfaces/WebSocket/events/002.html +++ b/websockets/interfaces/WebSocket/events/002.html
@@ -1,17 +1,17 @@ -<!doctype html> -<title>WebSockets: setting on*</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -var events = ['open', 'message', 'error', 'close']; -for (var i = 0; i < events.length; ++i) { - test(function(){ - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - var foo = function () {}; - ws['on'+events[i]] = foo; - assert_equals(ws['on'+events[i]], foo); - }); -} -</script> +<!doctype html> +<title>WebSockets: setting on*</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +var events = ['open', 'message', 'error', 'close']; +for (var i = 0; i < events.length; ++i) { + test(function(){ + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + var foo = function () {}; + ws['on'+events[i]] = foo; + assert_equals(ws['on'+events[i]], foo); + }); +} +</script> diff --git a/websockets/interfaces/WebSocket/events/003.html b/websockets/interfaces/WebSocket/events/003.html index b012635..962fae3 100644 --- a/websockets/interfaces/WebSocket/events/003.html +++ b/websockets/interfaces/WebSocket/events/003.html
@@ -1,19 +1,19 @@ -<!doctype html> -<title>WebSockets: listening for events with onopen</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - var foo = t.step_func(function (e) { - if (e.detail == 5) - t.done(); - }) - ws.onopen = foo; - var ev = document.createEvent('UIEvents'); - ev.initUIEvent('open', false, false, window, 5); - ws.dispatchEvent(ev); -}, null, {timeout:2000}); -</script> +<!doctype html> +<title>WebSockets: listening for events with onopen</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + var foo = t.step_func(function (e) { + if (e.detail == 5) + t.done(); + }) + ws.onopen = foo; + var ev = document.createEvent('UIEvents'); + ev.initUIEvent('open', false, false, window, 5); + ws.dispatchEvent(ev); +}, null, {timeout:2000}); +</script> diff --git a/websockets/interfaces/WebSocket/events/004.html b/websockets/interfaces/WebSocket/events/004.html index f5641b6..b26b279 100644 --- a/websockets/interfaces/WebSocket/events/004.html +++ b/websockets/interfaces/WebSocket/events/004.html
@@ -1,14 +1,14 @@ -<!doctype html> -<title>WebSockets: members of EventTarget</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function(){ - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - assert_equals(typeof ws.addEventListener, 'function'); - assert_equals(typeof ws.removeEventListener, 'function'); - assert_equals(typeof ws.dispatchEvent, 'function'); -}); -</script> +<!doctype html> +<title>WebSockets: members of EventTarget</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function(){ + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + assert_equals(typeof ws.addEventListener, 'function'); + assert_equals(typeof ws.removeEventListener, 'function'); + assert_equals(typeof ws.dispatchEvent, 'function'); +}); +</script> diff --git a/websockets/interfaces/WebSocket/events/006.html b/websockets/interfaces/WebSocket/events/006.html index f072e60..6fc1247 100644 --- a/websockets/interfaces/WebSocket/events/006.html +++ b/websockets/interfaces/WebSocket/events/006.html
@@ -1,15 +1,15 @@ -<!doctype html> -<title>WebSockets: 'on*' in ws</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function(){ - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - assert_equals('onopen' in ws, true, 'onopen'); - assert_equals('onmessage' in ws, true, 'onmessage'); - assert_equals('onerror' in ws, true, 'onerror'); - assert_equals('onclose' in ws, true, 'onclose'); -}); -</script> +<!doctype html> +<title>WebSockets: 'on*' in ws</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function(){ + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + assert_equals('onopen' in ws, true, 'onopen'); + assert_equals('onmessage' in ws, true, 'onmessage'); + assert_equals('onerror' in ws, true, 'onerror'); + assert_equals('onclose' in ws, true, 'onclose'); +}); +</script> diff --git a/websockets/interfaces/WebSocket/events/007.html b/websockets/interfaces/WebSocket/events/007.html index 44c33e7..79fd862 100644 --- a/websockets/interfaces/WebSocket/events/007.html +++ b/websockets/interfaces/WebSocket/events/007.html
@@ -1,19 +1,19 @@ -<!doctype html> -<title>WebSockets: listening for events with onmessage</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - var foo = t.step_func(function (e) { - if (e.detail == 5) - t.done(); - }) - ws.onmessage = foo; - var ev = document.createEvent('UIEvents'); - ev.initUIEvent('message', false, false, window, 5); - ws.dispatchEvent(ev); -}, null, {timeout:2000}); -</script> +<!doctype html> +<title>WebSockets: listening for events with onmessage</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + var foo = t.step_func(function (e) { + if (e.detail == 5) + t.done(); + }) + ws.onmessage = foo; + var ev = document.createEvent('UIEvents'); + ev.initUIEvent('message', false, false, window, 5); + ws.dispatchEvent(ev); +}, null, {timeout:2000}); +</script> diff --git a/websockets/interfaces/WebSocket/events/008.html b/websockets/interfaces/WebSocket/events/008.html index 74cf637..1229281 100644 --- a/websockets/interfaces/WebSocket/events/008.html +++ b/websockets/interfaces/WebSocket/events/008.html
@@ -1,22 +1,22 @@ -<!doctype html> -<title>WebSockets: listening for events with onerror</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - var run = false; - var foo = t.step_func(function (e) { - run = true; - assert_equals(e.detail, 5) - }); - ws.onerror = foo; - var ev = document.createEvent('UIEvents'); - ev.initUIEvent('error', false, false, window, 5); - ws.dispatchEvent(ev); - assert_true(run); - t.done(); -}); -</script> +<!doctype html> +<title>WebSockets: listening for events with onerror</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + var run = false; + var foo = t.step_func(function (e) { + run = true; + assert_equals(e.detail, 5) + }); + ws.onerror = foo; + var ev = document.createEvent('UIEvents'); + ev.initUIEvent('error', false, false, window, 5); + ws.dispatchEvent(ev); + assert_true(run); + t.done(); +}); +</script> diff --git a/websockets/interfaces/WebSocket/events/009.html b/websockets/interfaces/WebSocket/events/009.html index 8dc457c..76a13c8 100644 --- a/websockets/interfaces/WebSocket/events/009.html +++ b/websockets/interfaces/WebSocket/events/009.html
@@ -1,19 +1,19 @@ -<!doctype html> -<title>WebSockets: listening for events with onclose</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - var foo = t.step_func(function (e) { - if (e.detail == 5) - t.done(); - }); - ws.onclose = foo; - var ev = document.createEvent('UIEvents'); - ev.initUIEvent('close', false, false, window, 5); - ws.dispatchEvent(ev); -}, null, {timeout:2000}); -</script> +<!doctype html> +<title>WebSockets: listening for events with onclose</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + var foo = t.step_func(function (e) { + if (e.detail == 5) + t.done(); + }); + ws.onclose = foo; + var ev = document.createEvent('UIEvents'); + ev.initUIEvent('close', false, false, window, 5); + ws.dispatchEvent(ev); +}, null, {timeout:2000}); +</script> diff --git a/websockets/interfaces/WebSocket/events/010.html b/websockets/interfaces/WebSocket/events/010.html index 912c24e..367c36c 100644 --- a/websockets/interfaces/WebSocket/events/010.html +++ b/websockets/interfaces/WebSocket/events/010.html
@@ -1,19 +1,19 @@ -<!doctype html> -<title>WebSockets: setting event handlers to undefined</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -var events = ['onclose', 'onopen', 'onerror', 'onmessage']; -for (var i = 0; i < events.length; ++i) { - test(function(){ - var ws = new WebSocket(SCHEME_AND_DOMAIN+'/'); - var foo = function() {} - ws[events[i]] = foo; - assert_equals(ws[events[i]], foo, events[i]); - ws[events[i]] = undefined; - assert_equals(ws[events[i]], null, events[i]); - }); -} -</script> +<!doctype html> +<title>WebSockets: setting event handlers to undefined</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +var events = ['onclose', 'onopen', 'onerror', 'onmessage']; +for (var i = 0; i < events.length; ++i) { + test(function(){ + var ws = new WebSocket(SCHEME_AND_DOMAIN+'/'); + var foo = function() {} + ws[events[i]] = foo; + assert_equals(ws[events[i]], foo, events[i]); + ws[events[i]] = undefined; + assert_equals(ws[events[i]], null, events[i]); + }); +} +</script> diff --git a/websockets/interfaces/WebSocket/events/011.html b/websockets/interfaces/WebSocket/events/011.html index b88971f..a0043ed 100644 --- a/websockets/interfaces/WebSocket/events/011.html +++ b/websockets/interfaces/WebSocket/events/011.html
@@ -1,16 +1,16 @@ -<!doctype html> -<title>WebSockets: setting event handlers to 1</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -var events = ['onclose', 'onopen', 'onerror', 'onmessage']; -for (var i = 0; i < events.length; ++i) { - test(function(t) { - var ws = new WebSocket(SCHEME_AND_DOMAIN+'/'); - ws[events[i]] = 1; - assert_equals(ws[events[i]], null); - }, events[i]); -}; -</script> +<!doctype html> +<title>WebSockets: setting event handlers to 1</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +var events = ['onclose', 'onopen', 'onerror', 'onmessage']; +for (var i = 0; i < events.length; ++i) { + test(function(t) { + var ws = new WebSocket(SCHEME_AND_DOMAIN+'/'); + ws[events[i]] = 1; + assert_equals(ws[events[i]], null); + }, events[i]); +}; +</script> diff --git a/websockets/interfaces/WebSocket/events/012.html b/websockets/interfaces/WebSocket/events/012.html index 120f8ed..8a507d3 100644 --- a/websockets/interfaces/WebSocket/events/012.html +++ b/websockets/interfaces/WebSocket/events/012.html
@@ -1,16 +1,16 @@ -<!doctype html> -<title>WebSockets: setting event handlers to ";"</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -var events = ['onclose', 'onopen', 'onerror', 'onmessage']; -for (var i = 0; i < events.length; ++i) { - test(function(t) { - var ws = new WebSocket(SCHEME_AND_DOMAIN+'/'); - ws[events[i]] = ";"; - assert_equals(ws[events[i]], null); - }, events[i]); -}; -</script> +<!doctype html> +<title>WebSockets: setting event handlers to ";"</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +var events = ['onclose', 'onopen', 'onerror', 'onmessage']; +for (var i = 0; i < events.length; ++i) { + test(function(t) { + var ws = new WebSocket(SCHEME_AND_DOMAIN+'/'); + ws[events[i]] = ";"; + assert_equals(ws[events[i]], null); + }, events[i]); +}; +</script> diff --git a/websockets/interfaces/WebSocket/events/013.html b/websockets/interfaces/WebSocket/events/013.html index fd143f1..bb0972e 100644 --- a/websockets/interfaces/WebSocket/events/013.html +++ b/websockets/interfaces/WebSocket/events/013.html
@@ -1,16 +1,16 @@ -<!doctype html> -<title>WebSockets: setting event handlers to {handleEvent:function(){}}</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -var events = ['onclose', 'onopen', 'onerror', 'onmessage']; -for (var i = 0; i < events.length; ++i) { - test(function(t) { - var ws = new WebSocket(SCHEME_AND_DOMAIN+'/'); - ws[events[i]] = {handleEvent:function(){}}; - assert_equals(ws[events[i]], null); - }, events[i]); -}; -</script> +<!doctype html> +<title>WebSockets: setting event handlers to {handleEvent:function(){}}</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +var events = ['onclose', 'onopen', 'onerror', 'onmessage']; +for (var i = 0; i < events.length; ++i) { + test(function(t) { + var ws = new WebSocket(SCHEME_AND_DOMAIN+'/'); + ws[events[i]] = {handleEvent:function(){}}; + assert_equals(ws[events[i]], null); + }, events[i]); +}; +</script> diff --git a/websockets/interfaces/WebSocket/events/014.html b/websockets/interfaces/WebSocket/events/014.html index f3c7867..92304a6 100644 --- a/websockets/interfaces/WebSocket/events/014.html +++ b/websockets/interfaces/WebSocket/events/014.html
@@ -1,19 +1,19 @@ -<!doctype html> -<title>WebSockets: setting event handlers to null</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -var events = ['onclose', 'onopen', 'onerror', 'onmessage']; -for (var i = 0; i < events.length; ++i) { - test(function() { - var ws = new WebSocket(SCHEME_AND_DOMAIN+'/'); - var foo = function() {} - ws[events[i]] = foo; - assert_equals(ws[events[i]], foo, events[i]); - ws[events[i]] = null; - assert_equals(ws[events[i]], null, events[i]); - }, "Setting event handlers to null " + events[i]); -}; -</script> +<!doctype html> +<title>WebSockets: setting event handlers to null</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +var events = ['onclose', 'onopen', 'onerror', 'onmessage']; +for (var i = 0; i < events.length; ++i) { + test(function() { + var ws = new WebSocket(SCHEME_AND_DOMAIN+'/'); + var foo = function() {} + ws[events[i]] = foo; + assert_equals(ws[events[i]], foo, events[i]); + ws[events[i]] = null; + assert_equals(ws[events[i]], null, events[i]); + }, "Setting event handlers to null " + events[i]); +}; +</script> diff --git a/websockets/interfaces/WebSocket/events/015.html b/websockets/interfaces/WebSocket/events/015.html index 072d5f3..b677e1c 100644 --- a/websockets/interfaces/WebSocket/events/015.html +++ b/websockets/interfaces/WebSocket/events/015.html
@@ -1,31 +1,31 @@ -<!doctype html> -<title>WebSockets: instanceof on events</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo_raw'); - ws.onopen = t.step_func(function(e) { - assert_true(e instanceof Event); - // first a text frame, then a frame with reserved opcode 3 - // which should fail the connection - ws.send('\\x81\\x04test\\x83\\x03LOL'); - }); - ws.onmessage = t.step_func(function(e) { - assert_true(e instanceof Event); - assert_true(e instanceof MessageEvent); - assert_equals(ws.readyState, ws.OPEN); - }) - ws.onerror = t.step_func(function(e) { - assert_true(e instanceof Event); - assert_equals(ws.readyState, ws.CLOSED); - }) - ws.onclose = t.step_func(function(e) { - assert_true(e instanceof Event); - assert_true(e instanceof CloseEvent); - t.done(); - }) -}); -</script> +<!doctype html> +<title>WebSockets: instanceof on events</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo_raw'); + ws.onopen = t.step_func(function(e) { + assert_true(e instanceof Event); + // first a text frame, then a frame with reserved opcode 3 + // which should fail the connection + ws.send('\\x81\\x04test\\x83\\x03LOL'); + }); + ws.onmessage = t.step_func(function(e) { + assert_true(e instanceof Event); + assert_true(e instanceof MessageEvent); + assert_equals(ws.readyState, ws.OPEN); + }) + ws.onerror = t.step_func(function(e) { + assert_true(e instanceof Event); + assert_equals(ws.readyState, ws.CLOSED); + }) + ws.onclose = t.step_func(function(e) { + assert_true(e instanceof Event); + assert_true(e instanceof CloseEvent); + t.done(); + }) +}); +</script> diff --git a/websockets/interfaces/WebSocket/events/016.html b/websockets/interfaces/WebSocket/events/016.html index ce3bffb..b9dbfda 100644 --- a/websockets/interfaces/WebSocket/events/016.html +++ b/websockets/interfaces/WebSocket/events/016.html
@@ -1,35 +1,35 @@ -<!doctype html> -<title>WebSockets: addEventListener</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); - var count = 0; - var checkCount = t.step_func(function (c, e) { - count++; - assert_equals(count, c); - }); - // no spec requires this order for event listeners but the web does - ws.addEventListener('open', t.step_func(function(e) { - checkCount(1, e); - ws.send('Goodbye'); - }), false); - ws.onopen = t.step_func(function(e) {checkCount(2, e) }); - ws.addEventListener('open', t.step_func(function(e) {checkCount(3, e); }), false); - - ws.addEventListener('message', t.step_func(function(e) {checkCount(4, e); }), false); - ws.onmessage = t.step_func(function(e) {checkCount(5, e) }); - ws.addEventListener('message', t.step_func(function(e) {checkCount(6, e); }), false); - - ws.addEventListener('close', t.step_func(function(e) {checkCount(7, e); }), false); - ws.onclose = t.step_func(function(e) {checkCount(8, e) }); - ws.addEventListener('close', t.step_func(function(e) { - checkCount(9, e); - t.done(); - }), false); - -}); -</script> +<!doctype html> +<title>WebSockets: addEventListener</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); + var count = 0; + var checkCount = t.step_func(function (c, e) { + count++; + assert_equals(count, c); + }); + // no spec requires this order for event listeners but the web does + ws.addEventListener('open', t.step_func(function(e) { + checkCount(1, e); + ws.send('Goodbye'); + }), false); + ws.onopen = t.step_func(function(e) {checkCount(2, e) }); + ws.addEventListener('open', t.step_func(function(e) {checkCount(3, e); }), false); + + ws.addEventListener('message', t.step_func(function(e) {checkCount(4, e); }), false); + ws.onmessage = t.step_func(function(e) {checkCount(5, e) }); + ws.addEventListener('message', t.step_func(function(e) {checkCount(6, e); }), false); + + ws.addEventListener('close', t.step_func(function(e) {checkCount(7, e); }), false); + ws.onclose = t.step_func(function(e) {checkCount(8, e) }); + ws.addEventListener('close', t.step_func(function(e) { + checkCount(9, e); + t.done(); + }), false); + +}); +</script> diff --git a/websockets/interfaces/WebSocket/events/017.html b/websockets/interfaces/WebSocket/events/017.html index 24d0ccc..28282e6 100644 --- a/websockets/interfaces/WebSocket/events/017.html +++ b/websockets/interfaces/WebSocket/events/017.html
@@ -1,51 +1,51 @@ -<!doctype html> -<title>WebSockets: this, e.target, e.currentTarget, e.eventPhase</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo_raw'); - ws.addEventListener('open', function(e) { - var this_val = this; - t.step(function() { - // first a text frame, then a frame with reserved opcode 3 - // which should fail the connection - ws.send('\\x81\\x04test\\x83\\x03LOL'); - assert_equals(this_val, ws); - assert_equals(e.target, ws); - assert_equals(e.currentTarget, ws); - assert_equals(e.eventPhase, 2); - }); - }, false); - ws.addEventListener('message', function(e) { - var this_val = this; - t.step(function() { - assert_equals(this_val, ws); - assert_equals(e.target, ws); - assert_equals(e.currentTarget, ws); - assert_equals(e.eventPhase, 2); - }); - }, false); - ws.addEventListener('error', function(e) { - var this_val = this; - t.step(function() { - assert_equals(this_val, ws); - assert_equals(e.target, ws); - assert_equals(e.currentTarget, ws); - assert_equals(e.eventPhase, 2); - }); - }, false); - ws.addEventListener('close', function(e) { - var this_val = this; - t.step(function() { - assert_equals(this_val, ws); - assert_equals(e.target, ws); - assert_equals(e.currentTarget, ws); - assert_equals(e.eventPhase, 2); - t.done(); - }); - }, false); -}); -</script> +<!doctype html> +<title>WebSockets: this, e.target, e.currentTarget, e.eventPhase</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo_raw'); + ws.addEventListener('open', function(e) { + var this_val = this; + t.step(function() { + // first a text frame, then a frame with reserved opcode 3 + // which should fail the connection + ws.send('\\x81\\x04test\\x83\\x03LOL'); + assert_equals(this_val, ws); + assert_equals(e.target, ws); + assert_equals(e.currentTarget, ws); + assert_equals(e.eventPhase, 2); + }); + }, false); + ws.addEventListener('message', function(e) { + var this_val = this; + t.step(function() { + assert_equals(this_val, ws); + assert_equals(e.target, ws); + assert_equals(e.currentTarget, ws); + assert_equals(e.eventPhase, 2); + }); + }, false); + ws.addEventListener('error', function(e) { + var this_val = this; + t.step(function() { + assert_equals(this_val, ws); + assert_equals(e.target, ws); + assert_equals(e.currentTarget, ws); + assert_equals(e.eventPhase, 2); + }); + }, false); + ws.addEventListener('close', function(e) { + var this_val = this; + t.step(function() { + assert_equals(this_val, ws); + assert_equals(e.target, ws); + assert_equals(e.currentTarget, ws); + assert_equals(e.eventPhase, 2); + t.done(); + }); + }, false); +}); +</script> diff --git a/websockets/interfaces/WebSocket/events/018.html b/websockets/interfaces/WebSocket/events/018.html index 8ee5b8b..66fc6ba 100644 --- a/websockets/interfaces/WebSocket/events/018.html +++ b/websockets/interfaces/WebSocket/events/018.html
@@ -1,35 +1,35 @@ -<!doctype html> -<title>WebSockets: toString(), bubbles, cancelable</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo_raw'); - ws.addEventListener('open', t.step_func(function(e) { - // first a text frame, then a frame with reserved opcode 3 - // which should fail the connection - ws.send('\\x81\\x04test\\x83\\x03LOL'); - assert_equals(e.toString(), '[object Event]', "open e.toString()"); - assert_equals(e.bubbles, false, 'open e.bubbles'); - assert_equals(e.cancelable, false, 'open e.cancelable'); - }), false); - ws.addEventListener('message', t.step_func(function(e) { - assert_equals(e.toString(), '[object MessageEvent]', "message e.toString()"); - assert_equals(e.bubbles, false, 'message e.bubbles'); - assert_equals(e.cancelable, false, 'message e.cancelable'); - }), false); - ws.addEventListener('error', t.step_func(function(e) { - assert_equals(e.toString(), '[object Event]', "error e.toString()"); - assert_equals(e.bubbles, false, 'error e.bubbles'); - assert_equals(e.cancelable, false, 'error e.cancelable'); - }), false); - ws.addEventListener('close', t.step_func(function(e) { - assert_equals(e.toString(), '[object CloseEvent]', "close e.toString()"); - assert_equals(e.bubbles, false, 'close e.bubbles'); - assert_equals(e.cancelable, false, 'close e.cancelable'); - t.done(); - }), false); -}); -</script> +<!doctype html> +<title>WebSockets: toString(), bubbles, cancelable</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo_raw'); + ws.addEventListener('open', t.step_func(function(e) { + // first a text frame, then a frame with reserved opcode 3 + // which should fail the connection + ws.send('\\x81\\x04test\\x83\\x03LOL'); + assert_equals(e.toString(), '[object Event]', "open e.toString()"); + assert_equals(e.bubbles, false, 'open e.bubbles'); + assert_equals(e.cancelable, false, 'open e.cancelable'); + }), false); + ws.addEventListener('message', t.step_func(function(e) { + assert_equals(e.toString(), '[object MessageEvent]', "message e.toString()"); + assert_equals(e.bubbles, false, 'message e.bubbles'); + assert_equals(e.cancelable, false, 'message e.cancelable'); + }), false); + ws.addEventListener('error', t.step_func(function(e) { + assert_equals(e.toString(), '[object Event]', "error e.toString()"); + assert_equals(e.bubbles, false, 'error e.bubbles'); + assert_equals(e.cancelable, false, 'error e.cancelable'); + }), false); + ws.addEventListener('close', t.step_func(function(e) { + assert_equals(e.toString(), '[object CloseEvent]', "close e.toString()"); + assert_equals(e.bubbles, false, 'close e.bubbles'); + assert_equals(e.cancelable, false, 'close e.cancelable'); + t.done(); + }), false); +}); +</script> diff --git a/websockets/interfaces/WebSocket/events/019.html b/websockets/interfaces/WebSocket/events/019.html index 3bc947e..605cfce 100644 --- a/websockets/interfaces/WebSocket/events/019.html +++ b/websockets/interfaces/WebSocket/events/019.html
@@ -1,29 +1,29 @@ -<!doctype html> -<title>WebSockets: removeEventListener</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -var events = ['open', 'message', 'error', 'close']; -for (var i = 0; i < events.length; ++i) { - test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); - ws.close(); - var got = []; - var event; - function addThis(e) { - got.push(e.type); - } - ws.addEventListener(events[i], addThis, false); - ws.removeEventListener(events[i], addThis, false); - event = document.createEvent('Event'); - event.initEvent(events[i], false, false); - ws.dispatchEvent(event); - assert_equals(got.length, 0); - if (got.length) { - debug('Got: '+got); - } - }) -}; -</script> +<!doctype html> +<title>WebSockets: removeEventListener</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +var events = ['open', 'message', 'error', 'close']; +for (var i = 0; i < events.length; ++i) { + test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); + ws.close(); + var got = []; + var event; + function addThis(e) { + got.push(e.type); + } + ws.addEventListener(events[i], addThis, false); + ws.removeEventListener(events[i], addThis, false); + event = document.createEvent('Event'); + event.initEvent(events[i], false, false); + ws.dispatchEvent(event); + assert_equals(got.length, 0); + if (got.length) { + debug('Got: '+got); + } + }) +}; +</script> diff --git a/websockets/interfaces/WebSocket/events/020.html b/websockets/interfaces/WebSocket/events/020.html index c70b45d..6fd116d 100644 --- a/websockets/interfaces/WebSocket/events/020.html +++ b/websockets/interfaces/WebSocket/events/020.html
@@ -1,15 +1,15 @@ -<!doctype html> -<title>WebSockets: error events</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket('ws://example.invalid/'); - ws.onerror = t.step_func(function(e) { - assert_true(e instanceof Event); - t.done(); - }) -}); -</script> +<!doctype html> +<title>WebSockets: error events</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket('ws://example.invalid/'); + ws.onerror = t.step_func(function(e) { + assert_true(e instanceof Event); + t.done(); + }) +}); +</script> diff --git a/websockets/interfaces/WebSocket/readyState/001.html b/websockets/interfaces/WebSocket/readyState/001.html index 6eabd11..cd2a871 100644 --- a/websockets/interfaces/WebSocket/readyState/001.html +++ b/websockets/interfaces/WebSocket/readyState/001.html
@@ -1,11 +1,11 @@ -<!doctype html> -<title>WebSockets: getting readyState in connecting</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function(t) { - assert_equals((new WebSocket(SCHEME_DOMAIN_PORT+'/')).readyState, WebSocket.CONNECTING); -}); -</script> +<!doctype html> +<title>WebSockets: getting readyState in connecting</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function(t) { + assert_equals((new WebSocket(SCHEME_DOMAIN_PORT+'/')).readyState, WebSocket.CONNECTING); +}); +</script> diff --git a/websockets/interfaces/WebSocket/readyState/002.html b/websockets/interfaces/WebSocket/readyState/002.html index ee9e5bf..9b88e04 100644 --- a/websockets/interfaces/WebSocket/readyState/002.html +++ b/websockets/interfaces/WebSocket/readyState/002.html
@@ -1,13 +1,13 @@ -<!doctype html> -<title>WebSockets: setting readyState</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - ws.readyState = 5; - assert_equals(ws.readyState, ws.CONNECTING); -}); -</script> +<!doctype html> +<title>WebSockets: setting readyState</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + ws.readyState = 5; + assert_equals(ws.readyState, ws.CONNECTING); +}); +</script> diff --git a/websockets/interfaces/WebSocket/readyState/003.html b/websockets/interfaces/WebSocket/readyState/003.html index 7752979..8071d22 100644 --- a/websockets/interfaces/WebSocket/readyState/003.html +++ b/websockets/interfaces/WebSocket/readyState/003.html
@@ -1,15 +1,15 @@ -<!doctype html> -<title>WebSockets: delete readyState</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function(t) { - delete WebSocket.prototype.readyState; - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - ws.close(); - delete ws.readyState; - assert_equals(ws.readyState, ws.CLOSING); -}); -</script> +<!doctype html> +<title>WebSockets: delete readyState</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function(t) { + delete WebSocket.prototype.readyState; + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + ws.close(); + delete ws.readyState; + assert_equals(ws.readyState, ws.CLOSING); +}); +</script> diff --git a/websockets/interfaces/WebSocket/readyState/004.html b/websockets/interfaces/WebSocket/readyState/004.html index 5c1a5b0..bd8e499 100644 --- a/websockets/interfaces/WebSocket/readyState/004.html +++ b/websockets/interfaces/WebSocket/readyState/004.html
@@ -1,15 +1,15 @@ -<!doctype html> -<title>WebSockets: defineProperty getter for readyState</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function() { - Object.defineProperty(WebSocket.prototype, 'readyState', { - get: function() { return 'foo'; } - }); - var ws = new WebSocket('ws://example.invalid/'); - assert_equals(ws.readyState, 'foo'); -}); -</script> +<!doctype html> +<title>WebSockets: defineProperty getter for readyState</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function() { + Object.defineProperty(WebSocket.prototype, 'readyState', { + get: function() { return 'foo'; } + }); + var ws = new WebSocket('ws://example.invalid/'); + assert_equals(ws.readyState, 'foo'); +}); +</script> diff --git a/websockets/interfaces/WebSocket/readyState/005.html b/websockets/interfaces/WebSocket/readyState/005.html index 1aab4c2..a222f05 100644 --- a/websockets/interfaces/WebSocket/readyState/005.html +++ b/websockets/interfaces/WebSocket/readyState/005.html
@@ -1,17 +1,17 @@ -<!doctype html> -<title>WebSockets: defineProperty setter for readyState</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function(){ - window.setter_ran = false; - Object.defineProperty(WebSocket.prototype, 'readyState', { - set: function(v) { window[v] = true; } - }); - var ws = new WebSocket('ws://example.invalid/'); - ws.readyState = 'setter_ran'; - assert_true(setter_ran); -}); -</script> +<!doctype html> +<title>WebSockets: defineProperty setter for readyState</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function(){ + window.setter_ran = false; + Object.defineProperty(WebSocket.prototype, 'readyState', { + set: function(v) { window[v] = true; } + }); + var ws = new WebSocket('ws://example.invalid/'); + ws.readyState = 'setter_ran'; + assert_true(setter_ran); +}); +</script> diff --git a/websockets/interfaces/WebSocket/readyState/006.html b/websockets/interfaces/WebSocket/readyState/006.html index d682242..62b3a05 100644 --- a/websockets/interfaces/WebSocket/readyState/006.html +++ b/websockets/interfaces/WebSocket/readyState/006.html
@@ -1,17 +1,17 @@ -<!doctype html> -<title>WebSockets: getting readyState in open</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); - ws.onopen = t.step_func(function(e) { - assert_equals(ws.readyState, ws.OPEN); - ws.close(); - t.done(); - }); - ws.onerror = ws.onmessage = ws.onclose = t.step_func(function() {assert_unreached()}); -}); -</script> +<!doctype html> +<title>WebSockets: getting readyState in open</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); + ws.onopen = t.step_func(function(e) { + assert_equals(ws.readyState, ws.OPEN); + ws.close(); + t.done(); + }); + ws.onerror = ws.onmessage = ws.onclose = t.step_func(function() {assert_unreached()}); +}); +</script> diff --git a/websockets/interfaces/WebSocket/readyState/007.html b/websockets/interfaces/WebSocket/readyState/007.html index cc49853..39368aa 100644 --- a/websockets/interfaces/WebSocket/readyState/007.html +++ b/websockets/interfaces/WebSocket/readyState/007.html
@@ -1,17 +1,17 @@ -<!doctype html> -<title>WebSockets: getting readyState in closing</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); - ws.onopen = t.step_func(function(e) { - ws.close(); - assert_equals(ws.readyState, ws.CLOSING); - t.done(); - }); - ws.onerror = ws.onmessage = ws.onclose = t.step_func(function() {assert_unreached()}); -}); -</script> +<!doctype html> +<title>WebSockets: getting readyState in closing</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); + ws.onopen = t.step_func(function(e) { + ws.close(); + assert_equals(ws.readyState, ws.CLOSING); + t.done(); + }); + ws.onerror = ws.onmessage = ws.onclose = t.step_func(function() {assert_unreached()}); +}); +</script> diff --git a/websockets/interfaces/WebSocket/readyState/008.html b/websockets/interfaces/WebSocket/readyState/008.html index 57f853e..473f634 100644 --- a/websockets/interfaces/WebSocket/readyState/008.html +++ b/websockets/interfaces/WebSocket/readyState/008.html
@@ -1,19 +1,19 @@ -<!doctype html> -<title>WebSockets: getting readyState in closed</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); - ws.onopen = t.step_func(function(e) { - ws.onclose = t.step_func(function(e) { - assert_equals(ws.readyState, ws.CLOSED); - t.done(); - }) - ws.close(); - }); - ws.onerror = ws.onmessage = ws.onclose = t.step_func(function() {assert_unreached()}); -}); -</script> +<!doctype html> +<title>WebSockets: getting readyState in closed</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); + ws.onopen = t.step_func(function(e) { + ws.onclose = t.step_func(function(e) { + assert_equals(ws.readyState, ws.CLOSED); + t.done(); + }) + ws.close(); + }); + ws.onerror = ws.onmessage = ws.onclose = t.step_func(function() {assert_unreached()}); +}); +</script> diff --git a/websockets/interfaces/WebSocket/send/001.html b/websockets/interfaces/WebSocket/send/001.html index 2ee2170..8e75178 100644 --- a/websockets/interfaces/WebSocket/send/001.html +++ b/websockets/interfaces/WebSocket/send/001.html
@@ -1,13 +1,13 @@ -<!doctype html> -<title>WebSockets: send() with no args</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - assert_throws(new TypeError(), function(){ws.send()}); -}); -</script> - +<!doctype html> +<title>WebSockets: send() with no args</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + assert_throws(new TypeError(), function(){ws.send()}); +}); +</script> + diff --git a/websockets/interfaces/WebSocket/send/002.html b/websockets/interfaces/WebSocket/send/002.html index 6f90edb..4076938 100644 --- a/websockets/interfaces/WebSocket/send/002.html +++ b/websockets/interfaces/WebSocket/send/002.html
@@ -1,13 +1,13 @@ -<!doctype html> -<title>WebSockets: replacing send</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function() { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - ws.send = 5; - assert_equals(ws.send, 5); -}); -</script> +<!doctype html> +<title>WebSockets: replacing send</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function() { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + ws.send = 5; + assert_equals(ws.send, 5); +}); +</script> diff --git a/websockets/interfaces/WebSocket/send/003.html b/websockets/interfaces/WebSocket/send/003.html index 5fc7408..ddee85c 100644 --- a/websockets/interfaces/WebSocket/send/003.html +++ b/websockets/interfaces/WebSocket/send/003.html
@@ -1,13 +1,13 @@ -<!doctype html> -<title>WebSockets: send() when readyState is CONNECTING</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - assert_throws("INVALID_STATE_ERR", function(){ws.send('a')}); -}); -</script> - +<!doctype html> +<title>WebSockets: send() when readyState is CONNECTING</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + assert_throws("INVALID_STATE_ERR", function(){ws.send('a')}); +}); +</script> + diff --git a/websockets/interfaces/WebSocket/send/004.html b/websockets/interfaces/WebSocket/send/004.html index eebb2e8..0033d14 100644 --- a/websockets/interfaces/WebSocket/send/004.html +++ b/websockets/interfaces/WebSocket/send/004.html
@@ -1,23 +1,23 @@ -<!doctype html> -<title>WebSockets: send() with unpaired surrogate when readyState is CONNECTING</title> - -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - assert_throws("INVALID_STATE_ERR", function(){ws.send('a\uDC00x')}); -}, "lone low surrogate"); - -test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - assert_throws("INVALID_STATE_ERR", function(){ws.send('a\uD800x')}); -}, "lone high surrogate"); - -test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - assert_throws("INVALID_STATE_ERR", function(){ws.send('a\uDC00\uD800x')}); -}, "surrogates in wrong order"); -</script> +<!doctype html> +<title>WebSockets: send() with unpaired surrogate when readyState is CONNECTING</title> + +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + assert_throws("INVALID_STATE_ERR", function(){ws.send('a\uDC00x')}); +}, "lone low surrogate"); + +test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + assert_throws("INVALID_STATE_ERR", function(){ws.send('a\uD800x')}); +}, "lone high surrogate"); + +test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + assert_throws("INVALID_STATE_ERR", function(){ws.send('a\uDC00\uD800x')}); +}, "surrogates in wrong order"); +</script> diff --git a/websockets/interfaces/WebSocket/send/005.html b/websockets/interfaces/WebSocket/send/005.html index 1260a2f..2ead7ff 100644 --- a/websockets/interfaces/WebSocket/send/005.html +++ b/websockets/interfaces/WebSocket/send/005.html
@@ -1,16 +1,16 @@ -<!doctype html> -<title>WebSockets: send() return value</title> - -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t){ - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); - ws.onopen = t.step_func(function(e) { - assert_equals(ws.send('test'), undefined); - t.done(); - }); -}); -</script> +<!doctype html> +<title>WebSockets: send() return value</title> + +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t){ + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); + ws.onopen = t.step_func(function(e) { + assert_equals(ws.send('test'), undefined); + t.done(); + }); +}); +</script> diff --git a/websockets/interfaces/WebSocket/send/006.html b/websockets/interfaces/WebSocket/send/006.html index 0b3d03f..dc71978 100644 --- a/websockets/interfaces/WebSocket/send/006.html +++ b/websockets/interfaces/WebSocket/send/006.html
@@ -1,23 +1,23 @@ -<!doctype html> -<title>WebSockets: send() with unpaired surrogate when readyState is OPEN</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id="log"></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); - ws.onopen = t.step_func(function(e) { - // lone low surrogate, lone high surrogate + surrogates in wrong order. - ws.send('a\uDC00xb\uD800xc\uDC00\uD800x'); - }) - ws.onmessage = t.step_func(function(e) { - assert_equals(e.data, 'a\uFFFDxb\uFFFDxc\uFFFD\uFFFDx'); - ws.onclose = t.step_func(function(e) { - ws.onclose = t.step_func(function() {assert_unreached()}); - setTimeout(function() {t.done();}, 50); - }); - ws.close(); - }) - }); -</script> +<!doctype html> +<title>WebSockets: send() with unpaired surrogate when readyState is OPEN</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id="log"></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); + ws.onopen = t.step_func(function(e) { + // lone low surrogate, lone high surrogate + surrogates in wrong order. + ws.send('a\uDC00xb\uD800xc\uDC00\uD800x'); + }) + ws.onmessage = t.step_func(function(e) { + assert_equals(e.data, 'a\uFFFDxb\uFFFDxc\uFFFD\uFFFDx'); + ws.onclose = t.step_func(function(e) { + ws.onclose = t.step_func(function() {assert_unreached()}); + setTimeout(function() {t.done();}, 50); + }); + ws.close(); + }) + }); +</script> diff --git a/websockets/interfaces/WebSocket/send/007.html b/websockets/interfaces/WebSocket/send/007.html index 7f48e84..e10dd01 100644 --- a/websockets/interfaces/WebSocket/send/007.html +++ b/websockets/interfaces/WebSocket/send/007.html
@@ -1,24 +1,24 @@ -<!doctype html> -<title>WebSockets: close() followed by send()</title> - -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> - -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); - ws.onopen = t.step_func(function(e) { - // test that nothing strange happens if we send something after close() - ws.close(); - var sent = ws.send('test'); - assert_equals(sent, undefined); - }); - ws.onclose = t.step_func(function(e) { - ws.onclose = t.step_func(function() {assert_unreached()}); - setTimeout(function() {t.done()}, 50); - }); - ws.onerror = ws.onmessage = t.step_func(function() {assert_unreached()}); -}); -</script> +<!doctype html> +<title>WebSockets: close() followed by send()</title> + +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> + +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); + ws.onopen = t.step_func(function(e) { + // test that nothing strange happens if we send something after close() + ws.close(); + var sent = ws.send('test'); + assert_equals(sent, undefined); + }); + ws.onclose = t.step_func(function(e) { + ws.onclose = t.step_func(function() {assert_unreached()}); + setTimeout(function() {t.done()}, 50); + }); + ws.onerror = ws.onmessage = t.step_func(function() {assert_unreached()}); +}); +</script> diff --git a/websockets/interfaces/WebSocket/send/008.html b/websockets/interfaces/WebSocket/send/008.html index a7dbe48..bca801e 100644 --- a/websockets/interfaces/WebSocket/send/008.html +++ b/websockets/interfaces/WebSocket/send/008.html
@@ -1,23 +1,23 @@ -<!doctype html> -<title>WebSockets: send() in onclose</title> - -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); - ws.onopen = t.step_func(function(e) { - ws.send('Goodbye'); - }) - ws.onclose = t.step_func(function(e) { - // test that nothing strange happens when send()ing in closed state - var sent = ws.send('test'); - assert_equals(sent, undefined); - ws.onclose = t.step_func(function() {assert_unreached()}); - setTimeout(function() {t.done()}, 50); - }) - ws.onerror = t.step_func(function() {assert_unreached()}); -}); -</script> +<!doctype html> +<title>WebSockets: send() in onclose</title> + +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); + ws.onopen = t.step_func(function(e) { + ws.send('Goodbye'); + }) + ws.onclose = t.step_func(function(e) { + // test that nothing strange happens when send()ing in closed state + var sent = ws.send('test'); + assert_equals(sent, undefined); + ws.onclose = t.step_func(function() {assert_unreached()}); + setTimeout(function() {t.done()}, 50); + }) + ws.onerror = t.step_func(function() {assert_unreached()}); +}); +</script> diff --git a/websockets/interfaces/WebSocket/send/009.html b/websockets/interfaces/WebSocket/send/009.html index b92ca36..ad1d011 100644 --- a/websockets/interfaces/WebSocket/send/009.html +++ b/websockets/interfaces/WebSocket/send/009.html
@@ -1,24 +1,24 @@ -<!doctype html> -<title>WebSockets: send('')</title> - -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t){ - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/empty-message'); - ws.onopen = t.step_func(function(e) { - ws.send(''); - }) - ws.onmessage = t.step_func(function(e) { - assert_equals(e.data, 'pass'); - ws.close(); - }); - ws.onclose = t.step_func(function(e) { - ws.onclose = t.step_func(function() {assert_unreached()}); - setTimeout(function() {t.done()}, 50); - }); - ws.onerror = t.step_func(function() {assert_unreached()}); -}); -</script> +<!doctype html> +<title>WebSockets: send('')</title> + +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t){ + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/empty-message'); + ws.onopen = t.step_func(function(e) { + ws.send(''); + }) + ws.onmessage = t.step_func(function(e) { + assert_equals(e.data, 'pass'); + ws.close(); + }); + ws.onclose = t.step_func(function(e) { + ws.onclose = t.step_func(function() {assert_unreached()}); + setTimeout(function() {t.done()}, 50); + }); + ws.onerror = t.step_func(function() {assert_unreached()}); +}); +</script> diff --git a/websockets/interfaces/WebSocket/send/010.html b/websockets/interfaces/WebSocket/send/010.html index 65568f8..f7d785b 100644 --- a/websockets/interfaces/WebSocket/send/010.html +++ b/websockets/interfaces/WebSocket/send/010.html
@@ -1,39 +1,39 @@ -<!doctype html> -<title>WebSockets: sending non-strings</title> - -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(outer) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); - var stuffToSend = [null, undefined, 1, window, document.body, {}, [], ws, function(){}, new Error()] - var tests = []; - - for (var i=0; i<stuffToSend.length; i++) { - tests.push(async_test(document.title + " (" + stuffToSend[i] + ")")); - } - - i = 0; - function sendNext() { - if (i === stuffToSend.length) { - outer.done() - ws.close(); - } else { - var t = tests[i]; - ws.onmessage = t.step_func(function(e) { - assert_equals(e.data, String(stuffToSend[i])); - i++; - sendNext(); - t.done(); - }); - ws.onclose = ws.onerror = t.step_func(function() {assert_unreached()}); - ws.send(stuffToSend[i]); - } - } - ws.onopen = function(e) { - sendNext(); - } -}, "Constructor succeeds"); -</script> +<!doctype html> +<title>WebSockets: sending non-strings</title> + +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(outer) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); + var stuffToSend = [null, undefined, 1, window, document.body, {}, [], ws, function(){}, new Error()] + var tests = []; + + for (var i=0; i<stuffToSend.length; i++) { + tests.push(async_test(document.title + " (" + stuffToSend[i] + ")")); + } + + i = 0; + function sendNext() { + if (i === stuffToSend.length) { + outer.done() + ws.close(); + } else { + var t = tests[i]; + ws.onmessage = t.step_func(function(e) { + assert_equals(e.data, String(stuffToSend[i])); + i++; + sendNext(); + t.done(); + }); + ws.onclose = ws.onerror = t.step_func(function() {assert_unreached()}); + ws.send(stuffToSend[i]); + } + } + ws.onopen = function(e) { + sendNext(); + } +}, "Constructor succeeds"); +</script> diff --git a/websockets/interfaces/WebSocket/send/011.html b/websockets/interfaces/WebSocket/send/011.html index 865b509..cfefba2 100644 --- a/websockets/interfaces/WebSocket/send/011.html +++ b/websockets/interfaces/WebSocket/send/011.html
@@ -1,25 +1,25 @@ -<!doctype html> -<title>WebSockets: sending non-ascii, combining chars and non-BMP</title> - -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> - -async_test(function(t) { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); - ws.onopen = t.step_func(function(e) { - ws.send('\u00E5 a\u030A \uD801\uDC7E'); - }); - ws.onmessage = t.step_func(function(e) { - assert_equals(e.data, '\u00E5 a\u030A \uD801\uDC7E'); - ws.onclose = t.step_func(function(e) { - ws.onclose = t.step_func(function() {assert_unreached()}); - setTimeout(function() {t.done()}, 50); - }) - ws.close(); - }) - ws.onclose = ws.onerror = t.step_func(function() {assert_unreached()}); -}); -</script> +<!doctype html> +<title>WebSockets: sending non-ascii, combining chars and non-BMP</title> + +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> + +async_test(function(t) { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); + ws.onopen = t.step_func(function(e) { + ws.send('\u00E5 a\u030A \uD801\uDC7E'); + }); + ws.onmessage = t.step_func(function(e) { + assert_equals(e.data, '\u00E5 a\u030A \uD801\uDC7E'); + ws.onclose = t.step_func(function(e) { + ws.onclose = t.step_func(function() {assert_unreached()}); + setTimeout(function() {t.done()}, 50); + }) + ws.close(); + }) + ws.onclose = ws.onerror = t.step_func(function() {assert_unreached()}); +}); +</script> diff --git a/websockets/interfaces/WebSocket/send/012.html b/websockets/interfaces/WebSocket/send/012.html index aa3b728..76b112d 100644 --- a/websockets/interfaces/WebSocket/send/012.html +++ b/websockets/interfaces/WebSocket/send/012.html
@@ -1,25 +1,25 @@ -<!doctype html> -<title>WebSockets: sending null</title> - -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> - -async_test(function(t){ - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); - ws.onopen = t.step_func(function(e) { - ws.send(null); - }); - ws.onmessage = t.step_func(function(e) { - assert_equals(e.data, 'null'); - ws.onclose = t.step_func(function(e) { - ws.onclose = t.step_func(function() {assert_unreached()}); - setTimeout(function() {t.done()}, 50); - }) - ws.close(); - }); - ws.onclose = ws.onerror = t.step_func(function() {assert_unreached()}); -}); -</script> +<!doctype html> +<title>WebSockets: sending null</title> + +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> + +async_test(function(t){ + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/echo'); + ws.onopen = t.step_func(function(e) { + ws.send(null); + }); + ws.onmessage = t.step_func(function(e) { + assert_equals(e.data, 'null'); + ws.onclose = t.step_func(function(e) { + ws.onclose = t.step_func(function() {assert_unreached()}); + setTimeout(function() {t.done()}, 50); + }) + ws.close(); + }); + ws.onclose = ws.onerror = t.step_func(function() {assert_unreached()}); +}); +</script> diff --git a/websockets/interfaces/WebSocket/url/001.html b/websockets/interfaces/WebSocket/url/001.html index c77168e..5999f7e 100644 --- a/websockets/interfaces/WebSocket/url/001.html +++ b/websockets/interfaces/WebSocket/url/001.html
@@ -1,11 +1,11 @@ -<!doctype html> -<title>WebSockets: getting url</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function() { - assert_equals((new WebSocket(SCHEME_DOMAIN_PORT)).url, SCHEME_DOMAIN_PORT+'/'); -}); -</script> +<!doctype html> +<title>WebSockets: getting url</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function() { + assert_equals((new WebSocket(SCHEME_DOMAIN_PORT)).url, SCHEME_DOMAIN_PORT+'/'); +}); +</script> diff --git a/websockets/interfaces/WebSocket/url/002.html b/websockets/interfaces/WebSocket/url/002.html index 733dff2..1c58e86 100644 --- a/websockets/interfaces/WebSocket/url/002.html +++ b/websockets/interfaces/WebSocket/url/002.html
@@ -1,13 +1,13 @@ -<!doctype html> -<title>WebSockets: setting url</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function() { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - ws.url = SCHEME_DOMAIN_PORT+'/test'; - assert_equals(ws.url, SCHEME_DOMAIN_PORT+'/'); -}); -</script> +<!doctype html> +<title>WebSockets: setting url</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function() { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + ws.url = SCHEME_DOMAIN_PORT+'/test'; + assert_equals(ws.url, SCHEME_DOMAIN_PORT+'/'); +}); +</script> diff --git a/websockets/interfaces/WebSocket/url/003.html b/websockets/interfaces/WebSocket/url/003.html index 2c6c99e..1211893 100644 --- a/websockets/interfaces/WebSocket/url/003.html +++ b/websockets/interfaces/WebSocket/url/003.html
@@ -1,13 +1,13 @@ -<!doctype html> -<title>WebSockets: deleting url</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function() { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - delete ws.url; - assert_equals(ws.url, SCHEME_DOMAIN_PORT+'/'); -}); -</script> +<!doctype html> +<title>WebSockets: deleting url</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function() { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + delete ws.url; + assert_equals(ws.url, SCHEME_DOMAIN_PORT+'/'); +}); +</script> diff --git a/websockets/interfaces/WebSocket/url/004.html b/websockets/interfaces/WebSocket/url/004.html index a525edd..9203e1f 100644 --- a/websockets/interfaces/WebSocket/url/004.html +++ b/websockets/interfaces/WebSocket/url/004.html
@@ -1,15 +1,15 @@ -<!doctype html> -<title>WebSockets: 'URL'</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function() { - var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); - assert_equals(ws.URL, undefined); - assert_equals('URL' in ws, false); - assert_equals(WebSocket.prototype.URL, undefined); - assert_equals('URL' in WebSocket.prototype, false); -}); -</script> +<!doctype html> +<title>WebSockets: 'URL'</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function() { + var ws = new WebSocket(SCHEME_DOMAIN_PORT+'/'); + assert_equals(ws.URL, undefined); + assert_equals('URL' in ws, false); + assert_equals(WebSocket.prototype.URL, undefined); + assert_equals('URL' in WebSocket.prototype, false); +}); +</script> diff --git a/websockets/interfaces/WebSocket/url/005.html b/websockets/interfaces/WebSocket/url/005.html index c100000..457fe7b 100644 --- a/websockets/interfaces/WebSocket/url/005.html +++ b/websockets/interfaces/WebSocket/url/005.html
@@ -1,15 +1,15 @@ -<!doctype html> -<title>WebSockets: defineProperty getter for url</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function() { - Object.defineProperty(WebSocket.prototype, 'url', { - get: function() { return 'foo'; } - }); - var ws = new WebSocket('ws://example.invalid/'); - assert_equals(ws.url, 'foo'); -}); -</script> +<!doctype html> +<title>WebSockets: defineProperty getter for url</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function() { + Object.defineProperty(WebSocket.prototype, 'url', { + get: function() { return 'foo'; } + }); + var ws = new WebSocket('ws://example.invalid/'); + assert_equals(ws.url, 'foo'); +}); +</script> diff --git a/websockets/interfaces/WebSocket/url/006.html b/websockets/interfaces/WebSocket/url/006.html index 75102fe..05762ba 100644 --- a/websockets/interfaces/WebSocket/url/006.html +++ b/websockets/interfaces/WebSocket/url/006.html
@@ -1,17 +1,17 @@ -<!doctype html> -<title>WebSockets: defineProperty setter for url</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../../../constants.js?pipe=sub></script> -<div id=log></div> -<script> -test(function() { - window.setter_ran = false; - Object.defineProperty(WebSocket.prototype, 'url', { - set: function(v) { window[v] = true; } - }); - var ws = new WebSocket('ws://example.invalid/'); - ws.url = 'setter_ran'; - assert_true(setter_ran); -}); -</script> +<!doctype html> +<title>WebSockets: defineProperty setter for url</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../../../constants.js?pipe=sub></script> +<div id=log></div> +<script> +test(function() { + window.setter_ran = false; + Object.defineProperty(WebSocket.prototype, 'url', { + set: function(v) { window[v] = true; } + }); + var ws = new WebSocket('ws://example.invalid/'); + ws.url = 'setter_ran'; + assert_true(setter_ran); +}); +</script> diff --git a/websockets/keeping-connection-open/001.html b/websockets/keeping-connection-open/001.html index b8d9cc3..9897ffb 100644 --- a/websockets/keeping-connection-open/001.html +++ b/websockets/keeping-connection-open/001.html
@@ -1,26 +1,26 @@ -<!doctype html> -<title>WebSockets: 20s inactivity after handshake</title> -<meta name=timeout content=long> -<p>Note: This test takes 20 seconds to run.</p> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_AND_DOMAIN+'/echo'); - ws.onclose = ws.onerror = ws.onmessage = t.step_func(function() {assert_unreached()}); - ws.onopen = t.step_func(function(e) { - setTimeout(t.step_func(function() { - ws.send('test'); - ws.onmessage = t.step_func(function(e) { - assert_equals(e.data, 'test'); - ws.onclose = t.step_func(function(e) { - setTimeout(t.step_func(function() {t.done();}), 50) - }); - ws.close(); - }); - }), 20000); - }) -}, null, {timeout:30000}); -</script> +<!doctype html> +<title>WebSockets: 20s inactivity after handshake</title> +<meta name=timeout content=long> +<p>Note: This test takes 20 seconds to run.</p> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_AND_DOMAIN+'/echo'); + ws.onclose = ws.onerror = ws.onmessage = t.step_func(function() {assert_unreached()}); + ws.onopen = t.step_func(function(e) { + setTimeout(t.step_func(function() { + ws.send('test'); + ws.onmessage = t.step_func(function(e) { + assert_equals(e.data, 'test'); + ws.onclose = t.step_func(function(e) { + setTimeout(t.step_func(function() {t.done();}), 50) + }); + ws.close(); + }); + }), 20000); + }) +}, null, {timeout:30000}); +</script> diff --git a/websockets/opening-handshake/001.html b/websockets/opening-handshake/001.html index 1742ea3..6a03183 100644 --- a/websockets/opening-handshake/001.html +++ b/websockets/opening-handshake/001.html
@@ -1,17 +1,17 @@ -<!doctype html> -<title>WebSockets: invalid handshake</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_AND_DOMAIN+'/invalid'); - ws.onclose = t.step_func(function(e) { - assert_false(e.wasClean); - ws.onclose = t.step_func(function() {assert_unreached()}); - setTimeout(t.step_func(function() {t.done();}), 50) - }); - ws.onmessage = ws.onopen = t.step_func(function() {assert_unreached()}); -}, null, {timeout:9900}); -</script> +<!doctype html> +<title>WebSockets: invalid handshake</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_AND_DOMAIN+'/invalid'); + ws.onclose = t.step_func(function(e) { + assert_false(e.wasClean); + ws.onclose = t.step_func(function() {assert_unreached()}); + setTimeout(t.step_func(function() {t.done();}), 50) + }); + ws.onmessage = ws.onopen = t.step_func(function() {assert_unreached()}); +}, null, {timeout:9900}); +</script> diff --git a/websockets/opening-handshake/002.html b/websockets/opening-handshake/002.html index b8031ef..b3d8255 100644 --- a/websockets/opening-handshake/002.html +++ b/websockets/opening-handshake/002.html
@@ -1,21 +1,21 @@ -<!doctype html> -<title>WebSockets: valid handshake</title> -<meta name=timeout content=long> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_AND_DOMAIN+'/echo'); - ws.onopen = t.step_func(function(e) { - ws.onclose = t.step_func(function(e) { - assert_equals(e.wasClean, true); - ws.onclose = t.step_func(function() {assert_unreached()}); - setTimeout(t.step_func(function() {t.done();}), 50) - }) - ws.close(); - }); - ws.onerror = ws.onmessage = ws.onclose = t.step_func(function() {assert_unreached()}); -}, null, {timeout:9900}); -</script> +<!doctype html> +<title>WebSockets: valid handshake</title> +<meta name=timeout content=long> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_AND_DOMAIN+'/echo'); + ws.onopen = t.step_func(function(e) { + ws.onclose = t.step_func(function(e) { + assert_equals(e.wasClean, true); + ws.onclose = t.step_func(function() {assert_unreached()}); + setTimeout(t.step_func(function() {t.done();}), 50) + }) + ws.close(); + }); + ws.onerror = ws.onmessage = ws.onclose = t.step_func(function() {assert_unreached()}); +}, null, {timeout:9900}); +</script> diff --git a/websockets/opening-handshake/003.html b/websockets/opening-handshake/003.html index daa4537..ab64542 100644 --- a/websockets/opening-handshake/003.html +++ b/websockets/opening-handshake/003.html
@@ -1,21 +1,21 @@ -<!doctype html> -<title>WebSockets: origin</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_AND_DOMAIN+'/origin'); - ws.onmessage = t.step_func(function(e) { - assert_equals(e.data, location.protocol+'//'+location.host); - ws.onclose = t.step_func(function(e) { - assert_equals(e.wasClean, true); - ws.onclose = t.step_func(function() {assert_unreached()}); - setTimeout(t.step_func(function() {t.done();}), 50) - }) - ws.close(); - }) - ws.onerror = ws.onclose = t.step_func(function() {assert_unreached()}); -}); -</script> +<!doctype html> +<title>WebSockets: origin</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_AND_DOMAIN+'/origin'); + ws.onmessage = t.step_func(function(e) { + assert_equals(e.data, location.protocol+'//'+location.host); + ws.onclose = t.step_func(function(e) { + assert_equals(e.wasClean, true); + ws.onclose = t.step_func(function() {assert_unreached()}); + setTimeout(t.step_func(function() {t.done();}), 50) + }) + ws.close(); + }) + ws.onerror = ws.onclose = t.step_func(function() {assert_unreached()}); +}); +</script> diff --git a/websockets/opening-handshake/005.html b/websockets/opening-handshake/005.html index dab0d9c..b9b3d27 100644 --- a/websockets/opening-handshake/005.html +++ b/websockets/opening-handshake/005.html
@@ -1,20 +1,20 @@ -<!doctype html> -<title>WebSockets: proper first line</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_AND_DOMAIN+'/simple_handshake'); - ws.onmessage = t.step_func(function() {assert_unreached()}); - ws.onopen = t.step_func(function(e) { - ws.onclose = t.step_func(function(e) { - assert_equals(e.wasClean, true); - ws.onclose = t.step_func(function() {assert_unreached()}); - setTimeout(t.step_func(function() {t.done();}), 50) - }) - ws.close(); - }) -}); -</script> +<!doctype html> +<title>WebSockets: proper first line</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_AND_DOMAIN+'/simple_handshake'); + ws.onmessage = t.step_func(function() {assert_unreached()}); + ws.onopen = t.step_func(function(e) { + ws.onclose = t.step_func(function(e) { + assert_equals(e.wasClean, true); + ws.onclose = t.step_func(function() {assert_unreached()}); + setTimeout(t.step_func(function() {t.done();}), 50) + }) + ws.close(); + }) +}); +</script> diff --git a/websockets/security/001.html b/websockets/security/001.html index 7d75425..e35ab90 100644 --- a/websockets/security/001.html +++ b/websockets/security/001.html
@@ -1,14 +1,14 @@ -<!doctype html> -<title>WebSockets: wrong accept key</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var ws = new WebSocket(SCHEME_AND_DOMAIN+'/wrong_accept_key'); - ws.onclose = function(e) { - t.done(); - } -}); -</script> +<!doctype html> +<title>WebSockets: wrong accept key</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var ws = new WebSocket(SCHEME_AND_DOMAIN+'/wrong_accept_key'); + ws.onclose = function(e) { + t.done(); + } +}); +</script> diff --git a/websockets/security/002.html b/websockets/security/002.html index 7187562..bb4d8eb 100644 --- a/websockets/security/002.html +++ b/websockets/security/002.html
@@ -1,18 +1,18 @@ -<!doctype html> -<title>WebSockets: check Sec-WebSocket-Key</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<script> -async_test(function(t) { - var xhr = new XMLHttpRequest(); - xhr.onload = t.step_func(function() { - assert_equals(xhr.responseText, 'PASS'); - t.done(); - }); - xhr.open("GET", "check.py", true); - xhr.setRequestHeader('Sec-WebSocket-Key', 'jW7qmdXj5Kk5jTClF1BN3'); - xhr.send(null); -}); -</script> +<!doctype html> +<title>WebSockets: check Sec-WebSocket-Key</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<script> +async_test(function(t) { + var xhr = new XMLHttpRequest(); + xhr.onload = t.step_func(function() { + assert_equals(xhr.responseText, 'PASS'); + t.done(); + }); + xhr.open("GET", "check.py", true); + xhr.setRequestHeader('Sec-WebSocket-Key', 'jW7qmdXj5Kk5jTClF1BN3'); + xhr.send(null); +}); +</script> diff --git a/websockets/security/check.py b/websockets/security/check.py index 2d4f1b5..f141437 100644 --- a/websockets/security/check.py +++ b/websockets/security/check.py
@@ -1,2 +1,2 @@ -def main(request, response): - return "FAIL" if 'Sec-WebSocket-Key' in request.headers else "PASS" +def main(request, response): + return "FAIL" if 'Sec-WebSocket-Key' in request.headers else "PASS"
diff --git a/websockets/unload-a-document/001.html b/websockets/unload-a-document/001.html index 4563446..6683dba 100644 --- a/websockets/unload-a-document/001.html +++ b/websockets/unload-a-document/001.html
@@ -1,20 +1,20 @@ -<!doctype html> -<title>WebSockets: navigating top-level browsing context</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<p>Test requires popup blocker disabled</p> -<div id=log></div> -<script> -var t = async_test(); -var w; -t.step(function() { - w = window.open("001-1.html"); - add_result_callback(function() { - w.close(); - }); -}); -navigate = t.step_func(function() { - w.location = 'data:text/html,<body onload="history.back()">'; -}); -</script> +<!doctype html> +<title>WebSockets: navigating top-level browsing context</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<p>Test requires popup blocker disabled</p> +<div id=log></div> +<script> +var t = async_test(); +var w; +t.step(function() { + w = window.open("001-1.html"); + add_result_callback(function() { + w.close(); + }); +}); +navigate = t.step_func(function() { + w.location = 'data:text/html,<body onload="history.back()">'; +}); +</script> diff --git a/websockets/unload-a-document/002-1.html b/websockets/unload-a-document/002-1.html index b458d14..5fa938e 100644 --- a/websockets/unload-a-document/002-1.html +++ b/websockets/unload-a-document/002-1.html
@@ -1,32 +1,32 @@ -<!doctype html> -<title>WebSockets: navigating top-level browsing context with closed websocket</title> -<script src=../constants.js?pipe=sub></script> -<script> -var controller = opener || parent; -var t = controller.t; -var assert_equals = controller.asset_equals; -var assert_unreached = controller.assert_unreached ; -t.step(function() { - // this test can fail if the document is unloaded on navigation e.g. due to OOM - if (sessionStorage.second_run) { - delete sessionStorage.second_run; - assert_unreached('document was discarded'); - } else { - sessionStorage.second_run = 'true'; - var ws = new WebSocket(SCHEME_AND_DOMAIN+'/echo'); - ws.onopen = t.step_func(function(e) { - - setTimeout(t.step_func(function() { - delete sessionStorage.second_run; - assert_equals(ws.readyState, ws.CLOSED, 'ws.readyState'); - t.done(); - }), 4000); - ws.close(); - ws.onclose = t.step_func(function() { - controller.navigate(); - }); - }) - ws.onerror = ws.onmessage = ws.onclose = t.step_func(function() {assert_unreached()}); - } -}); -</script> +<!doctype html> +<title>WebSockets: navigating top-level browsing context with closed websocket</title> +<script src=../constants.js?pipe=sub></script> +<script> +var controller = opener || parent; +var t = controller.t; +var assert_equals = controller.asset_equals; +var assert_unreached = controller.assert_unreached ; +t.step(function() { + // this test can fail if the document is unloaded on navigation e.g. due to OOM + if (sessionStorage.second_run) { + delete sessionStorage.second_run; + assert_unreached('document was discarded'); + } else { + sessionStorage.second_run = 'true'; + var ws = new WebSocket(SCHEME_AND_DOMAIN+'/echo'); + ws.onopen = t.step_func(function(e) { + + setTimeout(t.step_func(function() { + delete sessionStorage.second_run; + assert_equals(ws.readyState, ws.CLOSED, 'ws.readyState'); + t.done(); + }), 4000); + ws.close(); + ws.onclose = t.step_func(function() { + controller.navigate(); + }); + }) + ws.onerror = ws.onmessage = ws.onclose = t.step_func(function() {assert_unreached()}); + } +}); +</script> diff --git a/websockets/unload-a-document/002.html b/websockets/unload-a-document/002.html index 157b494..11e6f5e 100644 --- a/websockets/unload-a-document/002.html +++ b/websockets/unload-a-document/002.html
@@ -1,21 +1,21 @@ -<!doctype html> -<title>WebSockets: navigating top-level browsing context with closed websocket</title> -<meta name=timeout content=long> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<p>Test requires popup blocker disabled</p> -<div id=log></div> -<script> -var t = async_test(null, {timeout:15000}); -var w; -t.step(function() { - w = window.open("002-1.html"); - add_result_callback(function() { - w.close(); - }); -}); -navigate = t.step_func(function() { - w.location = 'data:text/html,<body onload="history.back()">'; -}); -</script> +<!doctype html> +<title>WebSockets: navigating top-level browsing context with closed websocket</title> +<meta name=timeout content=long> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<p>Test requires popup blocker disabled</p> +<div id=log></div> +<script> +var t = async_test(null, {timeout:15000}); +var w; +t.step(function() { + w = window.open("002-1.html"); + add_result_callback(function() { + w.close(); + }); +}); +navigate = t.step_func(function() { + w.location = 'data:text/html,<body onload="history.back()">'; +}); +</script> diff --git a/websockets/unload-a-document/003.html b/websockets/unload-a-document/003.html index d3007f2..55d8a01 100644 --- a/websockets/unload-a-document/003.html +++ b/websockets/unload-a-document/003.html
@@ -1,12 +1,12 @@ -<!doctype html> -<title>WebSockets: navigating nested browsing context</title> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<div id=log></div> -<script> -var t = async_test() -var navigate = t.step_func(function() { - document.getElementsByTagName("iframe")[0].src = 'data:text/html,<body onload="history.back()">'; -}); -</script> +<!doctype html> +<title>WebSockets: navigating nested browsing context</title> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<div id=log></div> +<script> +var t = async_test() +var navigate = t.step_func(function() { + document.getElementsByTagName("iframe")[0].src = 'data:text/html,<body onload="history.back()">'; +}); +</script> <iframe src=001-1.html></iframe> \ No newline at end of file diff --git a/websockets/unload-a-document/004.html b/websockets/unload-a-document/004.html index 98611b3..7344b84 100644 --- a/websockets/unload-a-document/004.html +++ b/websockets/unload-a-document/004.html
@@ -1,13 +1,13 @@ -<!doctype html> -<title>WebSockets: navigating nested browsing context with closed websocket</title> -<meta name=timeout content=long> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<div id=log></div> -<script> -var t = async_test(null, {timeout:15000}) -var navigate = t.step_func(function() { - document.getElementsByTagName("iframe")[0].src = 'data:text/html,<body onload="history.back()">'; -}); -</script> -<iframe src=002-1.html></iframe> +<!doctype html> +<title>WebSockets: navigating nested browsing context with closed websocket</title> +<meta name=timeout content=long> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<div id=log></div> +<script> +var t = async_test(null, {timeout:15000}) +var navigate = t.step_func(function() { + document.getElementsByTagName("iframe")[0].src = 'data:text/html,<body onload="history.back()">'; +}); +</script> +<iframe src=002-1.html></iframe> diff --git a/websockets/unload-a-document/005-1.html b/websockets/unload-a-document/005-1.html index 9541b88..a7b1f1f 100644 --- a/websockets/unload-a-document/005-1.html +++ b/websockets/unload-a-document/005-1.html
@@ -1,23 +1,23 @@ -<!doctype html> -<title>WebSockets: navigating nested browsing context with a websocket in top-level</title> -<script src=../constants.js?pipe=sub></script> -<script> -var t = opener.t; -var assert_unreached = opener.assert_unreached; -var hasRun = false; -function run(){ - var ws = new WebSocket(SCHEME_AND_DOMAIN+'/echo'); - ws.onopen = t.step_func(function(e) { - setTimeout(t.step_func(function() { - ws.send('test'); - }), 1000); - window[0].location = 'data:text/html,<body onload="history.back()">'; - ws.onmessage = t.step_func(function(e) { - ws.close(); - t.done(); - }); - }); - ws.onerror = ws.onmessage = ws.onclose = t.step_func(function() {assert_unreached()}); -} -</script> -<iframe src='data:text/html,foo' onload='if (hasRun) return; hasRun = true; t.step(run)'></iframe> +<!doctype html> +<title>WebSockets: navigating nested browsing context with a websocket in top-level</title> +<script src=../constants.js?pipe=sub></script> +<script> +var t = opener.t; +var assert_unreached = opener.assert_unreached; +var hasRun = false; +function run(){ + var ws = new WebSocket(SCHEME_AND_DOMAIN+'/echo'); + ws.onopen = t.step_func(function(e) { + setTimeout(t.step_func(function() { + ws.send('test'); + }), 1000); + window[0].location = 'data:text/html,<body onload="history.back()">'; + ws.onmessage = t.step_func(function(e) { + ws.close(); + t.done(); + }); + }); + ws.onerror = ws.onmessage = ws.onclose = t.step_func(function() {assert_unreached()}); +} +</script> +<iframe src='data:text/html,foo' onload='if (hasRun) return; hasRun = true; t.step(run)'></iframe> diff --git a/websockets/unload-a-document/005.html b/websockets/unload-a-document/005.html index 97f846b..7375f64 100644 --- a/websockets/unload-a-document/005.html +++ b/websockets/unload-a-document/005.html
@@ -1,18 +1,18 @@ -<!doctype html> -<title>WebSockets: navigating nested browsing context with a websocket in top-level</title> -<meta name=timeout content=long> -<script src=/resources/testharness.js></script> -<script src=/resources/testharnessreport.js></script> -<script src=../constants.js?pipe=sub></script> -<div id=log></div> -<p>Test requires popup blocker disabled</p> -<div id=log></div> -<script> -var t = async_test(null, {timeout:15000}); -t.step(function() { - var w = window.open("005-1.html"); - add_result_callback(function() { - w.close(); - }); -}); -</script> +<!doctype html> +<title>WebSockets: navigating nested browsing context with a websocket in top-level</title> +<meta name=timeout content=long> +<script src=/resources/testharness.js></script> +<script src=/resources/testharnessreport.js></script> +<script src=../constants.js?pipe=sub></script> +<div id=log></div> +<p>Test requires popup blocker disabled</p> +<div id=log></div> +<script> +var t = async_test(null, {timeout:15000}); +t.step(function() { + var w = window.open("005-1.html"); + add_result_callback(function() { + w.close(); + }); +}); +</script> diff --git a/websockets/websocket.js b/websockets/websocket.js index 75314aa..d0fd713 100644 --- a/websockets/websocket.js +++ b/websockets/websocket.js
@@ -1,107 +1,107 @@ -var __SERVER__NAME = "{{host}}"; -var __PORT = {{ports[ws][0]}}; -var __SECURE__PORT = {{ports[ws][0]}}; //Should be wss -var __NEW__PORT = __PORT; //All ports are non-default for now -var __NEW_SECURE_PORT = __PORT; //All ports are non-default for now -var __PATH = "echo"; -var __CONTROLPATH = "control"; -var __PROTOCOL = "echo"; -var __PROTOCOLS = ["echo", "chat"]; -var __REPEATED__PROTOCOLS = ["echo", "echo"]; -var __URL; -var __IS__WEBSOCKET; -var __PASS = "Pass"; -var __FAIL = "Fail"; -var wsocket; -var csocket; -var data; - -// variables for testing Close Browser/Navigate Away scenarios -var isAssociated = false; -var guid; -var dataReceived; -var closeCode; -var urlToOpen; - -function IsWebSocket() { - if (!window.WebSocket) { - assert_true(false, "Browser does not support WebSocket"); - } -} - -function CreateWebSocketNonAbsolute() { - IsWebSocket(); - __URL = __SERVER__NAME; - wsocket = new WebSocket(__URL); -} - -function CreateWebSocketNonWsScheme() { - IsWebSocket(); - __URL = "http://" + __SERVER__NAME + ":" + __PORT + "/" + __PATH; - wsocket = new WebSocket(__URL); -} - -function CreateWebSocketNonAsciiProtocol(nonAsciiProtocol) { - IsWebSocket(); - __URL = "ws://" + __SERVER__NAME + ":" + __PORT + "/" + __PATH; - wsocket = new WebSocket(__URL, nonAsciiProtocol); -} - -function CreateWebSocketWithBlockedPort(blockedPort) { - IsWebSocket(); - __URL = "wss://" + __SERVER__NAME + ":" + blockedPort + "/" + __PATH; - wsocket = new WebSocket(__URL); -} - -function CreateWebSocketWithSpaceInUrl(urlWithSpace) { - IsWebSocket(); - __URL = "ws://" + urlWithSpace + ":" + __PORT + "/" + __PATH; - wsocket = new WebSocket(__URL); -} - -function CreateWebSocketWithSpaceInProtocol(protocolWithSpace) { - IsWebSocket(); - __URL = "ws://" + __SERVER__NAME + ":" + __PORT + "/" + __PATH; - wsocket = new WebSocket(__URL, protocolWithSpace); -} - -function CreateWebSocketWithRepeatedProtocols() { - IsWebSocket(); - __URL = "ws://" + __SERVER__NAME + ":" + __PORT + "/" + __PATH; - wsocket = new WebSocket(__URL, __REPEATED__PROTOCOLS); -} - -function CreateWebSocket(isSecure, isProtocol, isProtocols) { - IsWebSocket(); - if (isSecure) { - __URL = "wss://" + __SERVER__NAME + ":" + __SECURE__PORT + "/" + __PATH; - } - else { - __URL = "ws://" + __SERVER__NAME + ":" + __PORT + "/" + __PATH; - } - - if (isProtocol) { - wsocket = new WebSocket(__URL, __PROTOCOL); - } - else if (isProtocols) { - wsocket = new WebSocket(__URL, __PROTOCOLS); - } - else { - wsocket = new WebSocket(__URL); - } - return wsocket; -} - -function CreateControlWebSocket(isSecure) { - IsWebSocket(); - if (isSecure) { - __URL = "wss://" + __SERVER__NAME + ":" + __SECURE__PORT + "/" + __CONTROLPATH; - } - else { - __URL = "ws://" + __SERVER__NAME + ":" + __PORT + "/" + __CONTROLPATH; - } - - csocket = new WebSocket(__URL); - return csocket; -} - +var __SERVER__NAME = "{{host}}"; +var __PORT = {{ports[ws][0]}}; +var __SECURE__PORT = {{ports[ws][0]}}; //Should be wss +var __NEW__PORT = __PORT; //All ports are non-default for now +var __NEW_SECURE_PORT = __PORT; //All ports are non-default for now +var __PATH = "echo"; +var __CONTROLPATH = "control"; +var __PROTOCOL = "echo"; +var __PROTOCOLS = ["echo", "chat"]; +var __REPEATED__PROTOCOLS = ["echo", "echo"]; +var __URL; +var __IS__WEBSOCKET; +var __PASS = "Pass"; +var __FAIL = "Fail"; +var wsocket; +var csocket; +var data; + +// variables for testing Close Browser/Navigate Away scenarios +var isAssociated = false; +var guid; +var dataReceived; +var closeCode; +var urlToOpen; + +function IsWebSocket() { + if (!window.WebSocket) { + assert_true(false, "Browser does not support WebSocket"); + } +} + +function CreateWebSocketNonAbsolute() { + IsWebSocket(); + __URL = __SERVER__NAME; + wsocket = new WebSocket(__URL); +} + +function CreateWebSocketNonWsScheme() { + IsWebSocket(); + __URL = "http://" + __SERVER__NAME + ":" + __PORT + "/" + __PATH; + wsocket = new WebSocket(__URL); +} + +function CreateWebSocketNonAsciiProtocol(nonAsciiProtocol) { + IsWebSocket(); + __URL = "ws://" + __SERVER__NAME + ":" + __PORT + "/" + __PATH; + wsocket = new WebSocket(__URL, nonAsciiProtocol); +} + +function CreateWebSocketWithBlockedPort(blockedPort) { + IsWebSocket(); + __URL = "wss://" + __SERVER__NAME + ":" + blockedPort + "/" + __PATH; + wsocket = new WebSocket(__URL); +} + +function CreateWebSocketWithSpaceInUrl(urlWithSpace) { + IsWebSocket(); + __URL = "ws://" + urlWithSpace + ":" + __PORT + "/" + __PATH; + wsocket = new WebSocket(__URL); +} + +function CreateWebSocketWithSpaceInProtocol(protocolWithSpace) { + IsWebSocket(); + __URL = "ws://" + __SERVER__NAME + ":" + __PORT + "/" + __PATH; + wsocket = new WebSocket(__URL, protocolWithSpace); +} + +function CreateWebSocketWithRepeatedProtocols() { + IsWebSocket(); + __URL = "ws://" + __SERVER__NAME + ":" + __PORT + "/" + __PATH; + wsocket = new WebSocket(__URL, __REPEATED__PROTOCOLS); +} + +function CreateWebSocket(isSecure, isProtocol, isProtocols) { + IsWebSocket(); + if (isSecure) { + __URL = "wss://" + __SERVER__NAME + ":" + __SECURE__PORT + "/" + __PATH; + } + else { + __URL = "ws://" + __SERVER__NAME + ":" + __PORT + "/" + __PATH; + } + + if (isProtocol) { + wsocket = new WebSocket(__URL, __PROTOCOL); + } + else if (isProtocols) { + wsocket = new WebSocket(__URL, __PROTOCOLS); + } + else { + wsocket = new WebSocket(__URL); + } + return wsocket; +} + +function CreateControlWebSocket(isSecure) { + IsWebSocket(); + if (isSecure) { + __URL = "wss://" + __SERVER__NAME + ":" + __SECURE__PORT + "/" + __CONTROLPATH; + } + else { + __URL = "ws://" + __SERVER__NAME + ":" + __PORT + "/" + __CONTROLPATH; + } + + csocket = new WebSocket(__URL); + return csocket; +} + 